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

Commit d378aca6 authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge branch 'master'

parents abc71c46 7705a879

CREDITS

+0 −1
Original line number Diff line number Diff line
@@ -120,7 +120,6 @@ D: Author of lil (Linux Interrupt Latency benchmark) 
D: Fixed the shm swap deallocation at swapoff time (try_to_unuse message)

D: VM hacker

D: Various other kernel hacks

S: Via Cicalini 26

S: Imola 40026

S: Italy

MAINTAINERS

+2 −1
Original line number Diff line number Diff line
@@ -1752,7 +1752,8 @@ P: Ralf Baechle 
M:	ralf@linux-mips.org

W:	http://www.linux-mips.org/

L:	linux-mips@linux-mips.org

S:	Maintained

T:	git www.linux-mips.org:/pub/scm/linux.git

S:	Supported



MISCELLANEOUS MCA-SUPPORT

P:	James Bottomley

Makefile

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

PATCHLEVEL = 6

SUBLEVEL = 16

EXTRAVERSION =-rc6

EXTRAVERSION =

NAME=Sliding Snow Leopard



# *DOCUMENTATION*

arch/i386/kernel/smpboot.c

+10 −0
Original line number Diff line number Diff line
@@ -1029,6 +1029,16 @@ int __devinit smp_prepare_cpu(int cpu) 
	int	apicid, ret;



	lock_cpu_hotplug();



	/*

	 * On x86, CPU0 is never offlined.  Trying to bring up an

	 * already-booted CPU will hang.  So check for that case.

	 */

	if (cpu_online(cpu)) {

		ret = -EINVAL;

		goto exit;

	}



	apicid = x86_cpu_to_apicid[cpu];

	if (apicid == BAD_APICID) {

		ret = -ENODEV;

arch/mips/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -108,7 +108,8 @@ MODFLAGS += -mlong-calls 
cflags-$(CONFIG_CPU_BIG_ENDIAN)		+= $(shell $(CC) -dumpmachine |grep -q 'mips.*el-.*' && echo -EB)

cflags-$(CONFIG_CPU_LITTLE_ENDIAN)	+= $(shell $(CC) -dumpmachine |grep -q 'mips.*el-.*' || echo -EL)



cflags-$(CONFIG_SB1XXX_CORELIS)	+= -mno-sched-prolog -fno-omit-frame-pointer

cflags-$(CONFIG_SB1XXX_CORELIS)	+= $(call cc-option,-mno-sched-prolog) \

				   -fno-omit-frame-pointer



#

# Use: $(call set_gccflags,<cpu0>,<isa0>,<cpu1>,<isa1>,<isa2>)