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

Commit 9059b454 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 9539ce22 d57c4a38

arch/ia64/kernel/acpi-processor.c

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ static void init_intel_pdc(struct acpi_processor *pr) 


	buf[0] = ACPI_PDC_REVISION_ID;

	buf[1] = 1;

	buf[2] |= ACPI_PDC_EST_CAPABILITY_SMP;

	buf[2] = ACPI_PDC_EST_CAPABILITY_SMP;



	obj->type = ACPI_TYPE_BUFFER;

	obj->buffer.length = 12;

arch/ia64/kernel/acpi.c

+2 −1
Original line number Diff line number Diff line
@@ -67,7 +67,8 @@ EXPORT_SYMBOL(pm_power_off); 
unsigned int acpi_cpei_override;

unsigned int acpi_cpei_phys_cpuid;



const char *acpi_get_sysname(void)

const char __init *

acpi_get_sysname(void)

{

#ifdef CONFIG_IA64_GENERIC

	unsigned long rsdp_phys;

arch/ia64/kernel/smpboot.c

+2 −2
Original line number Diff line number Diff line
@@ -370,7 +370,7 @@ smp_setup_percpu_timer (void) 
{

}



static void __devinit

static void __cpuinit

smp_callin (void)

{

	int cpuid, phys_id, itc_master;
@@ -456,7 +456,7 @@ smp_callin (void) 
/*

 * Activate a secondary processor.  head.S calls this.

 */

int __devinit

int __cpuinit

start_secondary (void *unused)

{

	/* Early console may use I/O ports */

include/asm-ia64/acpi.h

+2 −5
Original line number Diff line number Diff line
@@ -30,6 +30,8 @@ 


#ifdef __KERNEL__



#include <acpi/pdc_intel.h>



#include <linux/init.h>

#include <linux/numa.h>

#include <asm/system.h>
@@ -119,11 +121,6 @@ extern int __devinitdata pxm_to_nid_map[MAX_PXM_DOMAINS]; 
extern int __initdata nid_to_pxm_map[MAX_NUMNODES];

#endif



/*

 * Refer Intel ACPI _PDC support document for bit definitions

 */

#define ACPI_PDC_EST_CAPABILITY_SMP     0x8



#endif /*__KERNEL__*/



#endif /*_ASM_ACPI_H*/