Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] acpi_get_sysname() should be __init
[IA64] Cleanup acpi header to reuse the generic _PDC defines
[IA64] Fix using uninitialized data in _PDC setup
[IA64] start_secondary() and smp_callin() should be __cpuinit
+7
-9
+1
-1
arch/ia64/kernel/acpi-processor.c
+1
-1
arch/ia64/kernel/acpi-processor.c
+2
-1
arch/ia64/kernel/acpi.c
+2
-1
arch/ia64/kernel/acpi.c
+2
-2
arch/ia64/kernel/smpboot.c
+2
-2
arch/ia64/kernel/smpboot.c
···
370
370
{
371
371
}
372
372
373
-
static void __devinit
373
+
static void __cpuinit
374
374
smp_callin (void)
375
375
{
376
376
int cpuid, phys_id, itc_master;
···
456
456
/*
457
457
* Activate a secondary processor. head.S calls this.
458
458
*/
459
-
int __devinit
459
+
int __cpuinit
460
460
start_secondary (void *unused)
461
461
{
462
462
/* Early console may use I/O ports */
+2
-5
include/asm-ia64/acpi.h
+2
-5
include/asm-ia64/acpi.h
···
30
30
31
31
#ifdef __KERNEL__
32
32
33
+
#include <acpi/pdc_intel.h>
34
+
33
35
#include <linux/init.h>
34
36
#include <linux/numa.h>
35
37
#include <asm/system.h>
···
120
118
extern int __devinitdata pxm_to_nid_map[MAX_PXM_DOMAINS];
121
119
extern int __initdata nid_to_pxm_map[MAX_NUMNODES];
122
120
#endif
123
-
124
-
/*
125
-
* Refer Intel ACPI _PDC support document for bit definitions
126
-
*/
127
-
#define ACPI_PDC_EST_CAPABILITY_SMP 0x8
128
121
129
122
#endif /*__KERNEL__*/
130
123