Commit 0404f87f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6 

* 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6:
  [PATCH] x86-64: Fix warnings in ia32_aout.c
  [PATCH] i386: Convert some functions to __init to avoid MODPOST warnings
  [PATCH] i386: Fix memory hotplug related MODPOST generated warning
  [PATCH] x86-64: tighten up printks
  [PATCH] x86-64: - Ignore long SMI interrupts in clock calibration
  [PATCH] x86-64: pci quirks MODPOST warning fix
  [PATCH] x86-64: Modpost whitelist reference to more symbols (pattern 3)
  [PATCH] x86-64: modpost add more symbols to whitelist pattern2
  [PATCH] i386: make apic probe function non-init
  [PATCH] i386: cpu hotplug/smpboot misc MODPOST warning fixes
  [PATCH] x86-64: Use different constraint for gcc < 4.1 in bitops.h
  [PATCH] x86-64: Make noirqdebug_setup function non init to fix modpost warning
  [PATCH] i386: Update defconfig
  [PATCH] x86-64: Update defconfig
parents 2d9819e3 74019699

arch/i386/defconfig

+10 −4
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.19-git14

# Sat Dec  9 21:23:14 2006

# Linux kernel version: 2.6.20-rc3

# Fri Jan  5 11:54:46 2007

#

CONFIG_X86_32=y

CONFIG_GENERIC_TIME=y
@@ -1286,6 +1286,11 @@ CONFIG_USB_MON=y 
# DMA Devices

#



#

# Virtualization

#

# CONFIG_KVM is not set



#

# File systems

#
@@ -1471,6 +1476,8 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y 
# CONFIG_ENABLE_MUST_CHECK is not set

CONFIG_MAGIC_SYSRQ=y

CONFIG_UNUSED_SYMBOLS=y

# CONFIG_DEBUG_FS is not set

# CONFIG_HEADERS_CHECK is not set

CONFIG_DEBUG_KERNEL=y

CONFIG_LOG_BUF_SHIFT=18

CONFIG_DETECT_SOFTLOCKUP=y
@@ -1489,12 +1496,10 @@ CONFIG_DETECT_SOFTLOCKUP=y 
# CONFIG_DEBUG_HIGHMEM is not set

CONFIG_DEBUG_BUGVERBOSE=y

# CONFIG_DEBUG_INFO is not set

# CONFIG_DEBUG_FS is not set

# CONFIG_DEBUG_VM is not set

# CONFIG_DEBUG_LIST is not set

# CONFIG_FRAME_POINTER is not set

# CONFIG_FORCED_INLINING is not set

# CONFIG_HEADERS_CHECK is not set

# CONFIG_RCU_TORTURE_TEST is not set

# CONFIG_LKDTM is not set

CONFIG_EARLY_PRINTK=y
@@ -1527,6 +1532,7 @@ CONFIG_CRC32=y 
# CONFIG_LIBCRC32C is not set

CONFIG_ZLIB_INFLATE=y

CONFIG_PLIST=y

CONFIG_IOMAP_COPY=y

CONFIG_GENERIC_HARDIRQS=y

CONFIG_GENERIC_IRQ_PROBE=y

CONFIG_GENERIC_PENDING_IRQ=y

arch/i386/kernel/mpparse.c

+4 −4
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 


/* Have we found an MP table */

int smp_found_config;

unsigned int __initdata maxcpus = NR_CPUS;

unsigned int __cpuinitdata maxcpus = NR_CPUS;



/*

 * Various Linux-internal data structures created from the
@@ -102,9 +102,9 @@ static int __init mpf_checksum(unsigned char *mp, int len) 
 */



static int mpc_record; 

static struct mpc_config_translation *translation_table[MAX_MPC_ENTRY] __initdata;

static struct mpc_config_translation *translation_table[MAX_MPC_ENTRY] __cpuinitdata;



static void __devinit MP_processor_info (struct mpc_config_processor *m)

static void __cpuinit MP_processor_info (struct mpc_config_processor *m)

{

 	int ver, apicid;

	physid_mask_t phys_cpu;
@@ -822,7 +822,7 @@ void __init mp_register_lapic_address(u64 address) 
	Dprintk("Boot CPU = %d\n", boot_cpu_physical_apicid);

}



void __devinit mp_register_lapic (u8 id, u8 enabled)

void __cpuinit mp_register_lapic (u8 id, u8 enabled)

{

	struct mpc_config_processor processor;

	int boot_cpu = 0;

arch/i386/kernel/setup.c

+2 −2
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ extern struct resource code_resource; 
extern struct resource data_resource;



/* cpu data as detected by the assembly code in head.S */

struct cpuinfo_x86 new_cpu_data __initdata = { 0, 0, 0, 0, -1, 1, 0, 0, -1 };

struct cpuinfo_x86 new_cpu_data __cpuinitdata = { 0, 0, 0, 0, -1, 1, 0, 0, -1 };

/* common cpu data for all cpus */

struct cpuinfo_x86 boot_cpu_data __read_mostly = { 0, 0, 0, 0, -1, 1, 0, 0, -1 };

EXPORT_SYMBOL(boot_cpu_data);
@@ -495,7 +495,7 @@ static void set_mca_bus(int x) { } 
#endif



/* Overridden in paravirt.c if CONFIG_PARAVIRT */

char * __attribute__((weak)) memory_setup(void)

char * __init __attribute__((weak)) memory_setup(void)

{

	return machine_specific_memory_setup();

}

arch/i386/kernel/smpboot.c

+5 −5
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ void __init smp_alloc_memory(void) 
 * a given CPU

 */



static void __devinit smp_store_cpu_info(int id)

static void __cpuinit smp_store_cpu_info(int id)

{

	struct cpuinfo_x86 *c = cpu_data + id;
@@ -364,7 +364,7 @@ extern void calibrate_delay(void); 


static atomic_t init_deasserted;



static void __devinit smp_callin(void)

static void __cpuinit smp_callin(void)

{

	int cpuid, phys_id;

	unsigned long timeout;
@@ -538,7 +538,7 @@ set_cpu_sibling_map(int cpu) 
/*

 * Activate a secondary processor.

 */

static void __devinit start_secondary(void *unused)

static void __cpuinit start_secondary(void *unused)

{

	/*

	 * Don't put *anything* before secondary_cpu_init(), SMP
@@ -931,7 +931,7 @@ static inline struct task_struct * alloc_idle_task(int cpu) 
#define alloc_idle_task(cpu) fork_idle(cpu)

#endif



static int __devinit do_boot_cpu(int apicid, int cpu)

static int __cpuinit do_boot_cpu(int apicid, int cpu)

/*

 * NOTE - on most systems this is a PHYSICAL apic ID, but on multiquad

 * (ie clustered apic addressing mode), this is a LOGICAL apic ID.
@@ -1432,7 +1432,7 @@ void __cpu_die(unsigned int cpu) 
}

#endif /* CONFIG_HOTPLUG_CPU */



int __devinit __cpu_up(unsigned int cpu)

int __cpuinit __cpu_up(unsigned int cpu)

{

#ifdef CONFIG_HOTPLUG_CPU

	int ret=0;

arch/i386/mach-generic/bigsmp.c

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ static struct dmi_system_id __initdata bigsmp_dmi_table[] = { 
};





static __init int probe_bigsmp(void)

static int probe_bigsmp(void)

{ 

	if (def_to_bigsmp)

        	dmi_bigsmp = 1;

CRA Git | Maintained and supported by SUSTech CRA and CCSE