mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-25 22:23:14 -04:00
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
This commit is contained in:
commit
3e01dfce13
21 changed files with 79 additions and 65 deletions
|
|
@ -10,8 +10,9 @@
|
|||
struct x86_cpu {
|
||||
struct cpu cpu;
|
||||
};
|
||||
extern int arch_register_cpu(int num);
|
||||
|
||||
#ifdef CONFIG_HOTPLUG_CPU
|
||||
extern int arch_register_cpu(int num);
|
||||
extern void arch_unregister_cpu(int);
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
#ifndef __ASSEMBLY__
|
||||
extern unsigned long find_e820_area(unsigned long start, unsigned long end,
|
||||
unsigned size);
|
||||
unsigned size, unsigned long align);
|
||||
extern void add_memory_region(unsigned long start, unsigned long size,
|
||||
int type);
|
||||
extern void setup_memory_region(void);
|
||||
|
|
@ -41,7 +41,7 @@ extern void finish_e820_parsing(void);
|
|||
extern struct e820map e820;
|
||||
extern void update_e820(void);
|
||||
|
||||
extern void reserve_early(unsigned long start, unsigned long end);
|
||||
extern void reserve_early(unsigned long start, unsigned long end, char *name);
|
||||
extern void early_res_to_bootmem(void);
|
||||
|
||||
#endif/*!__ASSEMBLY__*/
|
||||
|
|
|
|||
Loading…
Reference in a new issue