mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-02 07:31:26 +00:00
kernelPatches: remove unneeded patches
This commit is contained in:
parent
01f465c82b
commit
31ff655e46
@ -1,29 +0,0 @@
|
||||
From 54c2f3fdb941204cad136024c7b854b7ad112ab6 Mon Sep 17 00:00:00 2001
|
||||
From: Andi Kleen <ak@linux.intel.com>
|
||||
Date: Mon, 5 Aug 2013 15:02:45 -0700
|
||||
Subject: x86, asmlinkage, apm: Make APM data structure used from assembler
|
||||
visible
|
||||
|
||||
Signed-off-by: Andi Kleen <ak@linux.intel.com>
|
||||
Link: http://lkml.kernel.org/r/1375740170-7446-12-git-send-email-andi@firstfloor.org
|
||||
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
|
||||
---
|
||||
arch/x86/kernel/apm_32.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c
|
||||
index 53a4e27..3ab0343 100644
|
||||
--- a/arch/x86/kernel/apm_32.c
|
||||
+++ b/arch/x86/kernel/apm_32.c
|
||||
@@ -392,7 +392,7 @@ static struct cpuidle_device apm_cpuidle_device;
|
||||
/*
|
||||
* Local variables
|
||||
*/
|
||||
-static struct {
|
||||
+__visible struct {
|
||||
unsigned long offset;
|
||||
unsigned short segment;
|
||||
} apm_bios_entry;
|
||||
--
|
||||
cgit v0.12
|
||||
|
@ -1,46 +0,0 @@
|
||||
From cdd77e87eae52b7251acc5990207a1c4500a84ce Mon Sep 17 00:00:00 2001
|
||||
From: Andi Kleen <ak@linux.intel.com>
|
||||
Date: Tue, 5 Nov 2013 21:22:28 +1030
|
||||
Subject: x86, asmlinkage, lguest: Pass in globals into assembler statement
|
||||
|
||||
Tell the compiler that the inline assembler statement
|
||||
references lguest_entry.
|
||||
|
||||
This fixes compile problems with LTO where the variable
|
||||
and the assembler code may end up in different files.
|
||||
|
||||
Cc: x86@kernel.org
|
||||
Cc: rusty@rustcorp.com.au
|
||||
Signed-off-by: Andi Kleen <ak@linux.intel.com>
|
||||
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
|
||||
---
|
||||
drivers/lguest/x86/core.c | 6 ++++--
|
||||
1 file changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/drivers/lguest/x86/core.c b/drivers/lguest/x86/core.c
|
||||
index 5169239..922a1ac 100644
|
||||
--- a/drivers/lguest/x86/core.c
|
||||
+++ b/drivers/lguest/x86/core.c
|
||||
@@ -157,7 +157,7 @@ static void run_guest_once(struct lg_cpu *cpu, struct lguest_pages *pages)
|
||||
* stack, then the address of this call. This stack layout happens to
|
||||
* exactly match the stack layout created by an interrupt...
|
||||
*/
|
||||
- asm volatile("pushf; lcall *lguest_entry"
|
||||
+ asm volatile("pushf; lcall *%4"
|
||||
/*
|
||||
* This is how we tell GCC that %eax ("a") and %ebx ("b")
|
||||
* are changed by this routine. The "=" means output.
|
||||
@@ -169,7 +169,9 @@ static void run_guest_once(struct lg_cpu *cpu, struct lguest_pages *pages)
|
||||
* physical address of the Guest's top-level page
|
||||
* directory.
|
||||
*/
|
||||
- : "0"(pages), "1"(__pa(cpu->lg->pgdirs[cpu->cpu_pgd].pgdir))
|
||||
+ : "0"(pages),
|
||||
+ "1"(__pa(cpu->lg->pgdirs[cpu->cpu_pgd].pgdir)),
|
||||
+ "m"(lguest_entry)
|
||||
/*
|
||||
* We tell gcc that all these registers could change,
|
||||
* which means we don't have to save and restore them in
|
||||
--
|
||||
cgit v0.12
|
||||
|
@ -38,16 +38,6 @@ in
|
||||
|
||||
rec {
|
||||
|
||||
link_lguest =
|
||||
{ name = "gcc5-link-lguest";
|
||||
patch = ./gcc5-link-lguest.patch;
|
||||
};
|
||||
|
||||
link_apm =
|
||||
{ name = "gcc5-link-apm";
|
||||
patch = ./gcc5-link-apm.patch;
|
||||
};
|
||||
|
||||
bridge_stp_helper =
|
||||
{ name = "bridge-stp-helper";
|
||||
patch = ./bridge-stp-helper.patch;
|
||||
|
Loading…
Reference in New Issue
Block a user