Commit b1864e9a authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'x86/core' into perfcounters/core 

Conflicts:
	arch/x86/Kconfig
	arch/x86/kernel/apic.c
	arch/x86/kernel/setup_percpu.c
parents e9c4ffb1 7032e869

Documentation/x86/boot.txt

+7 −6
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ Offset Proto Name Meaning 
0202/4	2.00+	header		Magic signature "HdrS"

0206/2	2.00+	version		Boot protocol version supported

0208/4	2.00+	realmode_swtch	Boot loader hook (see below)

020C/2	2.00+	start_sys	The load-low segment (0x1000) (obsolete)

020C/2	2.00+	start_sys_seg	The load-low segment (0x1000) (obsolete)

020E/2	2.00+	kernel_version	Pointer to kernel version string

0210/1	2.00+	type_of_loader	Boot loader identifier

0211/1	2.00+	loadflags	Boot protocol option flags
@@ -170,10 +170,11 @@ Offset Proto Name Meaning 
0224/2	2.01+	heap_end_ptr	Free memory after setup end

0226/2	N/A	pad1		Unused

0228/4	2.02+	cmd_line_ptr	32-bit pointer to the kernel command line

022C/4	2.03+	initrd_addr_max	Highest legal initrd address

022C/4	2.03+	ramdisk_max	Highest legal initrd address

0230/4	2.05+	kernel_alignment Physical addr alignment required for kernel

0234/1	2.05+	relocatable_kernel Whether kernel is relocatable or not

0235/3	N/A	pad2		Unused

0235/1	N/A	pad2		Unused

0236/2	N/A	pad3		Unused

0238/4	2.06+	cmdline_size	Maximum size of the kernel command line

023C/4	2.07+	hardware_subarch Hardware subarchitecture

0240/8	2.07+	hardware_subarch_data Subarchitecture-specific data
@@ -299,14 +300,14 @@ Protocol: 2.00+ 
  e.g. 0x0204 for version 2.04, and 0x0a11 for a hypothetical version

  10.17.



Field name:	readmode_swtch

Field name:	realmode_swtch

Type:		modify (optional)

Offset/size:	0x208/4

Protocol:	2.00+



  Boot loader hook (see ADVANCED BOOT LOADER HOOKS below.)



Field name:	start_sys

Field name:	start_sys_seg

Type:		read

Offset/size:	0x20c/2

Protocol:	2.00+
@@ -468,7 +469,7 @@ Protocol: 2.02+ 
  zero, the kernel will assume that your boot loader does not support

  the 2.02+ protocol.



Field name:	initrd_addr_max

Field name:	ramdisk_max

Type:		read

Offset/size:	0x22c/4

Protocol:	2.03+

Makefile

+2 −1
Original line number Diff line number Diff line
@@ -532,8 +532,9 @@ KBUILD_CFLAGS += $(call cc-option,-Wframe-larger-than=${CONFIG_FRAME_WARN}) 
endif



# Force gcc to behave correct even for buggy distributions

# Arch Makefiles may override this setting

ifndef CONFIG_CC_STACKPROTECTOR

KBUILD_CFLAGS += $(call cc-option, -fno-stack-protector)

endif



ifdef CONFIG_FRAME_POINTER

KBUILD_CFLAGS	+= -fno-omit-frame-pointer -fno-optimize-sibling-calls

arch/ia64/include/asm/percpu.h

+2 −2
Original line number Diff line number Diff line
@@ -27,12 +27,12 @@ extern void *per_cpu_init(void); 


#else /* ! SMP */



#define PER_CPU_ATTRIBUTES	__attribute__((__section__(".data.percpu")))



#define per_cpu_init()				(__phys_per_cpu_start)



#endif	/* SMP */



#define PER_CPU_BASE_SECTION ".data.percpu"



/*

 * Be extremely careful when taking the address of this variable!  Due to virtual

 * remapping, it is different from the canonical address returned by __get_cpu_var(var)!

arch/ia64/include/asm/uv/uv.h

0 → 100644
+13 −0
Original line number Diff line number Diff line 
#ifndef _ASM_IA64_UV_UV_H

#define _ASM_IA64_UV_UV_H



#include <asm/system.h>

#include <asm/sn/simulator.h>



static inline int is_uv_system(void)

{

	/* temporary support for running on hardware simulator */

	return IS_MEDUSA() || ia64_platform_is("uv");

}



#endif	/* _ASM_IA64_UV_UV_H */

arch/ia64/kernel/acpi.c

+4 −0
Original line number Diff line number Diff line
@@ -199,6 +199,10 @@ char *__init __acpi_map_table(unsigned long phys_addr, unsigned long size) 
	return __va(phys_addr);

}



char *__init __acpi_unmap_table(unsigned long virt_addr, unsigned long size)

{

}



/* --------------------------------------------------------------------------

                            Boot-time Table Parsing

   -------------------------------------------------------------------------- */