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

Commit 9e40ade0 authored by Christoph Lameter's avatar Christoph Lameter
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

parents 7cc718d5 96b5a46e

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -3561,6 +3561,8 @@ P: Christoph Lameter 
M:	clameter@sgi.com

P:	Pekka Enberg

M:	penberg@cs.helsinki.fi

P:	Matt Mackall

M:	mpm@selenic.com

L:	linux-mm@kvack.org

S:	Maintained

arch/ia64/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -232,7 +232,14 @@ config PGTABLE_4 


endchoice



if IA64_HP_SIM

config HZ

	default 32

endif



if !IA64_HP_SIM

source kernel/Kconfig.hz

endif



config IA64_BRL_EMU

	bool

arch/x86/mm/pageattr-test.c

+0 −7
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ struct split_state { 
static int print_split(struct split_state *s)

{

	long i, expected, missed = 0;

	int printed = 0;

	int err = 0;



	s->lpg = s->gpg = s->spg = s->exec = 0;
@@ -53,12 +52,6 @@ static int print_split(struct split_state *s) 


		pte = lookup_address(addr, &level);

		if (!pte) {

			if (!printed) {

				dump_pagetable(addr);

				printk(KERN_INFO "CPA %lx no pte level %d\n",

					addr, level);

				printed = 1;

			}

			missed++;

			i++;

			continue;

arch/x86/vdso/Makefile

+12 −10
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ VDSO32-$(CONFIG_X86_32) := y 
VDSO32-$(CONFIG_COMPAT)		:= y



vdso-install-$(VDSO64-y)	+= vdso.so

vdso-install-$(VDSO32-y)	+= $(vdso32-y:=.so)

vdso-install-$(VDSO32-y)	+= $(vdso32-images)





# files to link into the vdso
@@ -63,6 +63,8 @@ vdso32.so-$(CONFIG_X86_32) += int80 
vdso32.so-$(CONFIG_COMPAT)	+= syscall

vdso32.so-$(VDSO32-y)		+= sysenter



vdso32-images			= $(vdso32.so-y:%=vdso32-%.so)



CPPFLAGS_vdso32.lds = $(CPPFLAGS_vdso.lds)

VDSO_LDFLAGS_vdso32.lds = -m elf_i386 -Wl,-soname=linux-gate.so.1
@@ -71,18 +73,18 @@ VDSO_LDFLAGS_vdso32.lds = -m elf_i386 -Wl,-soname=linux-gate.so.1 
override obj-dirs = $(dir $(obj)) $(obj)/vdso32/



targets += vdso32/vdso32.lds

targets += $(vdso32.so-y:%=vdso32-%.so.dbg) $(vdso32.so-y:%=vdso32-%.so)

targets += $(vdso32-images) $(vdso32-images:=.dbg)

targets += vdso32/note.o $(vdso32.so-y:%=vdso32/%.o)



extra-y	+= $(vdso32.so-y:%=vdso32-%.so)

extra-y	+= $(vdso32-images)



$(obj)/vdso32.o: $(vdso32.so-y:%=$(obj)/vdso32-%.so)

$(obj)/vdso32.o: $(vdso32-images:%=$(obj)/%)



KBUILD_AFLAGS_32 := $(filter-out -m64,$(KBUILD_AFLAGS))

$(vdso32.so-y:%=$(obj)/vdso32-%.so.dbg): KBUILD_AFLAGS = $(KBUILD_AFLAGS_32)

$(vdso32.so-y:%=$(obj)/vdso32-%.so.dbg): asflags-$(CONFIG_X86_64) += -m32

$(vdso32-images:%=$(obj)/%.dbg): KBUILD_AFLAGS = $(KBUILD_AFLAGS_32)

$(vdso32-images:%=$(obj)/%.dbg): asflags-$(CONFIG_X86_64) += -m32



$(vdso32.so-y:%=$(obj)/vdso32-%.so.dbg): $(obj)/vdso32-%.so.dbg: FORCE \

$(vdso32-images:%=$(obj)/%.dbg): $(obj)/vdso32-%.so.dbg: FORCE \

				 $(obj)/vdso32/vdso32.lds \

				 $(obj)/vdso32/note.o \

				 $(obj)/vdso32/%.o

drivers/acpi/wmi.c

+2 −2
Original line number Diff line number Diff line
@@ -673,11 +673,11 @@ static int __init acpi_wmi_init(void) 
{

	acpi_status result;



	INIT_LIST_HEAD(&wmi_blocks.list);



	if (acpi_disabled)

		return -ENODEV;



	INIT_LIST_HEAD(&wmi_blocks.list);



	result = acpi_bus_register_driver(&acpi_wmi_driver);



	if (result < 0) {