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

Commit cfad589f authored by Paul Mackerras's avatar Paul Mackerras
Browse files

Merge branch 'linux-2.6' into for-2.6.25

parents bc625f20 437105f2

Makefile

+6 −8
Original line number Diff line number Diff line
@@ -108,6 +108,9 @@ endif 
PHONY := _all

_all:



# Cancel implicit rules on top Makefile

$(CURDIR)/Makefile Makefile: ;



ifneq ($(KBUILD_OUTPUT),)

# Invoke a second make in the output directory, passing relevant variables

# check that the output directory actually exists
@@ -115,13 +118,10 @@ saved-output := $(KBUILD_OUTPUT) 
KBUILD_OUTPUT := $(shell cd $(KBUILD_OUTPUT) && /bin/pwd)

$(if $(KBUILD_OUTPUT),, \

     $(error output directory "$(saved-output)" does not exist))

# Check that OUTPUT directory is not the same as where we have kernel src

$(if $(filter-out $(KBUILD_OUTPUT),$(shell /bin/pwd)),, \

     $(error Output directory (O=...) specifies kernel src dir))



PHONY += $(MAKECMDGOALS) sub-make



$(filter-out _all sub-make,$(MAKECMDGOALS)) _all: sub-make

$(filter-out _all sub-make $(CURDIR)/Makefile, $(MAKECMDGOALS)) _all: sub-make

	$(Q)@:



sub-make: FORCE
@@ -291,7 +291,8 @@ export quiet Q KBUILD_VERBOSE 
# Look for make include files relative to root of kernel src

MAKEFLAGS += --include-dir=$(srctree)



# We need some generic definitions.

# We need some generic definitions (do not try to remake the file).

$(srctree)/scripts/Kbuild.include: ;

include $(srctree)/scripts/Kbuild.include



# Make variables (CC, etc...)
@@ -1560,9 +1561,6 @@ endif # skip-makefile 
PHONY += FORCE

FORCE:



# Cancel implicit rules on top Makefile, `-rR' will apply to sub-makes.

Makefile: ;



# Declare the contents of the .PHONY variable as phony.  We keep that

# information in a variable se we can use it in if_changed and friends.

.PHONY: $(PHONY)

arch/ia64/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ vmlinux.gz: vmlinux 
	$(Q)$(MAKE) $(build)=$(boot) $@



unwcheck: vmlinux

	-$(Q)READELF=$(READELF) $(srctree)/arch/ia64/scripts/unwcheck.py $<

	-$(Q)READELF=$(READELF) python $(srctree)/arch/ia64/scripts/unwcheck.py $<



archclean:

	$(Q)$(MAKE) $(clean)=$(boot)

arch/ia64/hp/sim/boot/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -33,5 +33,5 @@ $(obj)/vmlinux.bin: vmlinux FORCE 
LDFLAGS_bootloader = -static -T



$(obj)/bootloader: $(src)/bootloader.lds $(obj)/bootloader.o $(obj)/boot_head.o $(obj)/fw-emu.o \

                   lib/lib.a arch/ia64/lib/lib.a FORCE

                   lib/lib.a arch/ia64/lib/built-in.o arch/ia64/lib/lib.a FORCE

	$(call if_changed,ld)

arch/ia64/hp/sim/boot/bootloader.lds

+2 −1
Original line number Diff line number Diff line
@@ -22,10 +22,11 @@ SECTIONS 
  .sdata     : { *(.sdata) }

  _edata  =  .;



  _bss = .;

  __bss_start = .;

  .sbss      : { *(.sbss) *(.scommon) }

  .bss       : { *(.bss) *(COMMON) }

  . = ALIGN(64 / 8);

  __bss_stop = .;

  _end = . ;



  /* Stabs debugging sections.  */

arch/ia64/kernel/acpi.c

+1 −1
Original line number Diff line number Diff line
@@ -860,7 +860,7 @@ int acpi_map_lsapic(acpi_handle handle, int *pcpu) 
	lsapic = (struct acpi_madt_local_sapic *)obj->buffer.pointer;



	if ((lsapic->header.type != ACPI_MADT_TYPE_LOCAL_SAPIC) ||

	    (!lsapic->lapic_flags & ACPI_MADT_ENABLED)) {

	    (!(lsapic->lapic_flags & ACPI_MADT_ENABLED))) {

		kfree(buffer.pointer);

		return -EINVAL;

	}