lkml.org 
[lkml]   [2008]   [Jun]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] x86: clean up ARCH_SETUP
Date

asm-x86/paravirt.h already have protection with CONFIG_PARAVIRT inside

Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>

---
arch/x86/kernel/setup.c | 8 ++++----
include/asm-x86/mach-default/setup_arch.h | 4 ----
include/asm-x86/mach-visws/setup_arch.h | 2 --
3 files changed, 4 insertions(+), 10 deletions(-)

Index: linux-2.6/arch/x86/kernel/setup.c
===================================================================
--- linux-2.6.orig/arch/x86/kernel/setup.c
+++ linux-2.6/arch/x86/kernel/setup.c
@@ -100,11 +100,7 @@
#include <asm/proto.h>

#include <mach_apic.h>
-#ifdef CONFIG_PARAVIRT
#include <asm/paravirt.h>
-#else
-#define ARCH_SETUP
-#endif

#include <asm/percpu.h>
#include <asm/sections.h>
@@ -114,6 +110,10 @@
#include <asm/highmem.h>
#endif

+#ifndef ARCH_SETUP
+#define ARCH_SETUP
+#endif
+
#ifndef CONFIG_DEBUG_BOOT_PARAMS
struct boot_params __initdata boot_params;
#else
Index: linux-2.6/include/asm-x86/mach-default/setup_arch.h
===================================================================
--- linux-2.6.orig/include/asm-x86/mach-default/setup_arch.h
+++ linux-2.6/include/asm-x86/mach-default/setup_arch.h
@@ -1,7 +1,3 @@
/* Hook to call BIOS initialisation function */

/* no action for generic */
-
-#ifndef ARCH_SETUP
-#define ARCH_SETUP
-#endif
Index: linux-2.6/include/asm-x86/mach-visws/setup_arch.h
===================================================================
--- linux-2.6.orig/include/asm-x86/mach-visws/setup_arch.h
+++ linux-2.6/include/asm-x86/mach-visws/setup_arch.h
@@ -4,5 +4,3 @@ extern unsigned long sgivwfb_mem_phys;
extern unsigned long sgivwfb_mem_size;

/* no action for visws */
-
-#define ARCH_SETUP

\
 
 \ /
  Last update: 2008-06-26 04:53    [W:0.388 / U:0.260 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site