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

Commit 13e65280 authored by David Woodhouse's avatar David Woodhouse
Browse files

Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

parents 4332bdd3 88d7bd8c 88d7bd8c

Makefile

+1 −1
Original line number Original line Diff line number Diff line 
VERSION = 2

VERSION = 2

PATCHLEVEL = 6

PATCHLEVEL = 6

SUBLEVEL = 12

SUBLEVEL = 12

EXTRAVERSION =-rc3

EXTRAVERSION =-rc4

NAME=Woozy Numbat

NAME=Woozy Numbat





# *DOCUMENTATION*

# *DOCUMENTATION*

arch/i386/kernel/acpi/boot.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -650,7 +650,7 @@ acpi_find_rsdp (void) 
	 */

	 */

	rsdp_phys = acpi_scan_rsdp (0, 0x400);

	rsdp_phys = acpi_scan_rsdp (0, 0x400);

	if (!rsdp_phys)

	if (!rsdp_phys)

		rsdp_phys = acpi_scan_rsdp (0xE0000, 0xFFFFF);

		rsdp_phys = acpi_scan_rsdp (0xE0000, 0x20000);





	return rsdp_phys;

	return rsdp_phys;

}

}

arch/ppc/Kconfig

+2 −0
Original line number Original line Diff line number Diff line
@@ -77,9 +77,11 @@ config 44x 
	bool "44x"

	bool "44x"





config POWER3

config POWER3

	select PPC_FPU

	bool "POWER3"

	bool "POWER3"





config POWER4

config POWER4

	select PPC_FPU

	bool "POWER4 and 970 (G5)"

	bool "POWER4 and 970 (G5)"





config 8xx

config 8xx

arch/ppc64/Kconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -262,6 +262,7 @@ config PPC_RTAS 
config RTAS_PROC

config RTAS_PROC

	bool "Proc interface to RTAS"

	bool "Proc interface to RTAS"

	depends on PPC_RTAS

	depends on PPC_RTAS

	default y





config RTAS_FLASH

config RTAS_FLASH

	tristate "Firmware flash interface"

	tristate "Firmware flash interface"

arch/ppc64/kernel/pSeries_smp.c

+0 −7
Original line number Original line Diff line number Diff line
@@ -326,13 +326,6 @@ static void __devinit smp_xics_setup_cpu(int cpu) 




	cpu_clear(cpu, of_spin_map);

	cpu_clear(cpu, of_spin_map);





	/*

	 * Put the calling processor into the GIQ.  This is really only

	 * necessary from a secondary thread as the OF start-cpu interface

	 * performs this function for us on primary threads.

	 */

	rtas_set_indicator(GLOBAL_INTERRUPT_QUEUE,

		(1UL << interrupt_server_size) - 1 - default_distrib_server, 1);

}

}





static DEFINE_SPINLOCK(timebase_lock);

static DEFINE_SPINLOCK(timebase_lock);