The patch titled
paravirt: pae compile fix
has been added to the -mm tree. Its filename is
paravirt-pae-compile-fix.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: paravirt: pae compile fix
From: Zachary Amsden <zach@xxxxxxxxxx>
During tracking down a PAE compile failure, I found that config.h was being
included in a bunch of places in i386 code. It is no longer necessary, so
drop it.
Signed-off-by: Zachary Amsden <zach@xxxxxxxxxx>
Cc: Rusty Russell <rusty@xxxxxxxxxxxxxxx>
Cc: Jeremy Fitzhardinge <jeremy@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/i386/boot/video.S | 2 --
arch/i386/kernel/nmi.c | 1 -
arch/i386/lib/delay.c | 1 -
include/asm-i386/dwarf2.h | 2 --
include/asm-i386/tsc.h | 1 -
include/linux/unwind.h | 2 --
6 files changed, 9 deletions(-)
diff -puN arch/i386/boot/video.S~paravirt-pae-compile-fix arch/i386/boot/video.S
--- a/arch/i386/boot/video.S~paravirt-pae-compile-fix
+++ a/arch/i386/boot/video.S
@@ -11,8 +11,6 @@
*
*/
-#include <linux/config.h> /* for CONFIG_VIDEO_* */
-
/* Enable autodetection of SVGA adapters and modes. */
#undef CONFIG_VIDEO_SVGA
diff -puN arch/i386/kernel/nmi.c~paravirt-pae-compile-fix arch/i386/kernel/nmi.c
--- a/arch/i386/kernel/nmi.c~paravirt-pae-compile-fix
+++ a/arch/i386/kernel/nmi.c
@@ -13,7 +13,6 @@
* Mikael Pettersson : PM converted to driver model. Disable/enable API.
*/
-#include <linux/config.h>
#include <linux/delay.h>
#include <linux/interrupt.h>
#include <linux/module.h>
diff -puN arch/i386/lib/delay.c~paravirt-pae-compile-fix arch/i386/lib/delay.c
--- a/arch/i386/lib/delay.c~paravirt-pae-compile-fix
+++ a/arch/i386/lib/delay.c
@@ -11,7 +11,6 @@
*/
#include <linux/module.h>
-#include <linux/config.h>
#include <linux/sched.h>
#include <linux/delay.h>
diff -puN include/asm-i386/dwarf2.h~paravirt-pae-compile-fix include/asm-i386/dwarf2.h
--- a/include/asm-i386/dwarf2.h~paravirt-pae-compile-fix
+++ a/include/asm-i386/dwarf2.h
@@ -1,8 +1,6 @@
#ifndef _DWARF2_H
#define _DWARF2_H
-#include <linux/config.h>
-
#ifndef __ASSEMBLY__
#warning "asm/dwarf2.h should be only included in pure assembly files"
#endif
diff -puN include/asm-i386/tsc.h~paravirt-pae-compile-fix include/asm-i386/tsc.h
--- a/include/asm-i386/tsc.h~paravirt-pae-compile-fix
+++ a/include/asm-i386/tsc.h
@@ -6,7 +6,6 @@
#ifndef _ASM_i386_TSC_H
#define _ASM_i386_TSC_H
-#include <linux/config.h>
#include <asm/processor.h>
/*
diff -puN include/linux/unwind.h~paravirt-pae-compile-fix include/linux/unwind.h
--- a/include/linux/unwind.h~paravirt-pae-compile-fix
+++ a/include/linux/unwind.h
@@ -12,8 +12,6 @@
* is not much point in implementing the full Dwarf2 unwind API.
*/
-#include <linux/config.h>
-
struct module;
#ifdef CONFIG_STACK_UNWIND
_
Patches currently in -mm which might be from zach@xxxxxxxxxx are
split-i386-and-x86_64-ptraceh.patch
uml-use-ptrace-abih-instead-of-ptraceh.patch
x86-allow-a-kernel-to-not-be-in-ring-0.patch
x86-allow-a-kernel-to-not-be-in-ring-0-tidy.patch
x86-add-a-bootparameter-to-reserve-high-linear-address-space.patch
x86-trivial-pgtableh-__assembly__-move.patch
x86-trivial-move-of-__have-macros-in-i386-pagetable-headers.patch
x86-trivial-move-of-ptep_set_access_flags.patch
x86-remove-unused-include-from-efi_stubs.patch
paravirt-remove-read-hazard-from-cow.patch
paravirt-pte-clear-not-present.patch
paravirt-lazy-mmu-mode-hooks.patch
paravirt-combine-flush-accessed-dirty.patch
paravirt-kpte-flush.patch
paravirt-optimize-ptep-establish-for-pae.patch
paravirt-remove-set-pte-atomic.patch
paravirt-pae-compile-fix.patch
paravirt-update-pte-hook.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
