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

Commit a84f5770 authored by Tony Luck's avatar Tony Luck
Browse files

Merge with /home/aegl/GIT/linus

parents 66302f21 88d7bd8c

Makefile

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

PATCHLEVEL = 6

SUBLEVEL = 12

EXTRAVERSION =-rc3

EXTRAVERSION =-rc4

NAME=Woozy Numbat



# *DOCUMENTATION*

arch/i386/kernel/acpi/boot.c

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

	rsdp_phys = acpi_scan_rsdp (0, 0x400);

	if (!rsdp_phys)

		rsdp_phys = acpi_scan_rsdp (0xE0000, 0xFFFFF);

		rsdp_phys = acpi_scan_rsdp (0xE0000, 0x20000);



	return rsdp_phys;

}

arch/ppc/Kconfig

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



config POWER3

	select PPC_FPU

	bool "POWER3"



config POWER4

	select PPC_FPU

	bool "POWER4 and 970 (G5)"



config 8xx

arch/ppc64/Kconfig

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

	bool "Proc interface to RTAS"

	depends on PPC_RTAS

	default y



config RTAS_FLASH

	tristate "Firmware flash interface"

arch/um/include/user_util.h

+0 −1
Original line number Diff line number Diff line
@@ -67,7 +67,6 @@ extern void *um_kmalloc(int size); 
extern int switcheroo(int fd, int prot, void *from, void *to, int size);

extern void setup_machinename(char *machine_out);

extern void setup_hostinfo(void);

extern void add_arg(char *arg);

extern void init_new_thread_stack(void *sig_stack, void (*usr1_handler)(int));

extern void init_new_thread_signals(int altstack);

extern void do_exec(int old_pid, int new_pid);