Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3e01dfce authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86 

* git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86:
  x86: avoid section mismatch involving arch_register_cpu
  x86: fixes for lookup_address args
  x86: fix sparse warnings in cpu/common.c
  x86: make early_console static in early_printk.c
  x86: remove unneeded round_up
  x86: fix section mismatch warning in kernel/pci-calgary
  x86: fix section mismatch warning in acpi/boot.c
  x86: fix section mismatch warnings when referencing notifiers
  x86: silence section mismatch warning in smpboot_64.c
  x86: fix comments in vmlinux_64.lds
  x86_64: make bootmap_start page align v6
  x86_64: add debug name for early_res
parents 45f37e86 d9874026

arch/x86/boot/compressed/vmlinux_64.lds

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ OUTPUT_ARCH(i386:x86-64) 
ENTRY(startup_64)

SECTIONS

{

	/* Be careful parts of head_64.S assume startup_64 is at

	/* Be careful parts of head_64.S assume startup_32 is at

	 * address 0.

	 */

	. = 0;

arch/x86/kernel/acpi/boot.c

+7 −1
Original line number Diff line number Diff line
@@ -496,7 +496,8 @@ EXPORT_SYMBOL(acpi_register_gsi); 
 *  ACPI based hotplug support for CPU

 */

#ifdef CONFIG_ACPI_HOTPLUG_CPU

int acpi_map_lsapic(acpi_handle handle, int *pcpu)



static int __cpuinit _acpi_map_lsapic(acpi_handle handle, int *pcpu)

{

	struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };

	union acpi_object *obj;
@@ -551,6 +552,11 @@ int acpi_map_lsapic(acpi_handle handle, int *pcpu) 
	return 0;

}



/* wrapper to silence section mismatch warning */

int __ref acpi_map_lsapic(acpi_handle handle, int *pcpu)

{

	return _acpi_map_lsapic(handle, pcpu);

}

EXPORT_SYMBOL(acpi_map_lsapic);



int acpi_unmap_lsapic(int cpu)

arch/x86/kernel/cpu/common.c

+10 −10
Original line number Diff line number Diff line
@@ -258,10 +258,10 @@ static int __cpuinit have_cpuid_p(void) 
void __init cpu_detect(struct cpuinfo_x86 *c)

{

	/* Get vendor name */

	cpuid(0x00000000, &c->cpuid_level,

	      (int *)&c->x86_vendor_id[0],

	      (int *)&c->x86_vendor_id[8],

	      (int *)&c->x86_vendor_id[4]);

	cpuid(0x00000000, (unsigned int *)&c->cpuid_level,

	      (unsigned int *)&c->x86_vendor_id[0],

	      (unsigned int *)&c->x86_vendor_id[8],

	      (unsigned int *)&c->x86_vendor_id[4]);



	c->x86 = 4;

	if (c->cpuid_level >= 0x00000001) {
@@ -283,7 +283,7 @@ void __init cpu_detect(struct cpuinfo_x86 *c) 
static void __cpuinit early_get_cap(struct cpuinfo_x86 *c)

{

	u32 tfms, xlvl;

	int ebx;

	unsigned int ebx;



	memset(&c->x86_capability, 0, sizeof c->x86_capability);

	if (have_cpuid_p()) {
@@ -343,14 +343,14 @@ static void __init early_cpu_detect(void) 
static void __cpuinit generic_identify(struct cpuinfo_x86 * c)

{

	u32 tfms, xlvl;

	int ebx;

	unsigned int ebx;



	if (have_cpuid_p()) {

		/* Get vendor name */

		cpuid(0x00000000, &c->cpuid_level,

		      (int *)&c->x86_vendor_id[0],

		      (int *)&c->x86_vendor_id[8],

		      (int *)&c->x86_vendor_id[4]);

		cpuid(0x00000000, (unsigned int *)&c->cpuid_level,

		      (unsigned int *)&c->x86_vendor_id[0],

		      (unsigned int *)&c->x86_vendor_id[8],

		      (unsigned int *)&c->x86_vendor_id[4]);

		

		get_cpu_vendor(c, 0);

		/* Initialize the standard set of capabilities */

arch/x86/kernel/cpuid.c

+1 −1
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ static int __cpuinit cpuid_class_cpu_callback(struct notifier_block *nfb, 
	return err ? NOTIFY_BAD : NOTIFY_OK;

}



static struct notifier_block __cpuinitdata cpuid_class_cpu_notifier =

static struct notifier_block __refdata cpuid_class_cpu_notifier =

{

	.notifier_call = cpuid_class_cpu_callback,

};

arch/x86/kernel/e820_64.c

+15 −8
Original line number Diff line number Diff line
@@ -54,30 +54,33 @@ static unsigned long __initdata end_user_pfn = MAXMEM>>PAGE_SHIFT; 


struct early_res {

	unsigned long start, end;

	char name[16];

};

static struct early_res early_res[MAX_EARLY_RES] __initdata = {

	{ 0, PAGE_SIZE },			/* BIOS data page */

	{ 0, PAGE_SIZE, "BIOS data page" },			/* BIOS data page */

#ifdef CONFIG_SMP

	{ SMP_TRAMPOLINE_BASE, SMP_TRAMPOLINE_BASE + 2*PAGE_SIZE },

	{ SMP_TRAMPOLINE_BASE, SMP_TRAMPOLINE_BASE + 2*PAGE_SIZE, "SMP_TRAMPOLINE" },

#endif

	{}

};



void __init reserve_early(unsigned long start, unsigned long end)

void __init reserve_early(unsigned long start, unsigned long end, char *name)

{

	int i;

	struct early_res *r;

	for (i = 0; i < MAX_EARLY_RES && early_res[i].end; i++) {

		r = &early_res[i];

		if (end > r->start && start < r->end)

			panic("Overlapping early reservations %lx-%lx to %lx-%lx\n",

			      start, end, r->start, r->end);

			panic("Overlapping early reservations %lx-%lx %s to %lx-%lx %s\n",

			      start, end - 1, name?name:"", r->start, r->end - 1, r->name);

	}

	if (i >= MAX_EARLY_RES)

		panic("Too many early reservations");

	r = &early_res[i];

	r->start = start;

	r->end = end;

	if (name)

		strncpy(r->name, name, sizeof(r->name) - 1);

}



void __init early_res_to_bootmem(void)
@@ -85,6 +88,8 @@ void __init early_res_to_bootmem(void) 
	int i;

	for (i = 0; i < MAX_EARLY_RES && early_res[i].end; i++) {

		struct early_res *r = &early_res[i];

		printk(KERN_INFO "early res: %d [%lx-%lx] %s\n", i,

			r->start, r->end - 1, r->name);

		reserve_bootmem_generic(r->start, r->end - r->start);

	}

}
@@ -166,12 +171,13 @@ int __init e820_all_mapped(unsigned long start, unsigned long end, 
}



/*

 * Find a free area in a specific range.

 * Find a free area with specified alignment in a specific range.

 */

unsigned long __init find_e820_area(unsigned long start, unsigned long end,

				    unsigned size)

				    unsigned size, unsigned long align)

{

	int i;

	unsigned long mask = ~(align - 1);



	for (i = 0; i < e820.nr_map; i++) {

		struct e820entry *ei = &e820.map[i];
@@ -185,7 +191,8 @@ unsigned long __init find_e820_area(unsigned long start, unsigned long end, 
			continue;

		while (bad_addr(&addr, size) && addr+size <= ei->addr+ei->size)

			;

		last = PAGE_ALIGN(addr) + size;

		addr = (addr + align - 1) & mask;

		last = addr + size;

		if (last > ei->addr + ei->size)

			continue;

		if (last > end)