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

Commit 437105f2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] Fix iosapic interrupt delivery mode for CPE
  [IA64] kprobe: make kreturn probe handler stack unwind correct
  [IA64] operator priority fix in acpi_map_lsapic()
  [IA64] Add missing "space" to concatenated strings
  [IA64] make full use of macro efi_md_size
  [IA64] rename _bss to __bss_start
  [IA64] SGI Altix : fix bug in sn_io_late_init()
  [IA64] iosapic cleanup
  [IA64] signal : fix missing error checkings
  [IA64] export copy_page() to modules
  [IA64] don't assume that unwcheck.py is executable
  [IA64] increase .data.patch offset
parents 41f81e88 aa0ebec9

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;

	}

arch/ia64/kernel/efi.c

+5 −5
Original line number Diff line number Diff line
@@ -370,7 +370,7 @@ efi_get_pal_addr (void) 
			continue;

		}



		if (md->num_pages << EFI_PAGE_SHIFT > IA64_GRANULE_SIZE)

		if (efi_md_size(md) > IA64_GRANULE_SIZE)

			panic("Woah!  PAL code size bigger than a granule!");



#if EFI_DEBUG
@@ -378,7 +378,7 @@ efi_get_pal_addr (void) 


		printk(KERN_INFO "CPU %d: mapping PAL code [0x%lx-0x%lx) into [0x%lx-0x%lx)\n",

			smp_processor_id(), md->phys_addr,

			md->phys_addr + (md->num_pages << EFI_PAGE_SHIFT),

			md->phys_addr + efi_md_size(md),

			vaddr & mask, (vaddr & mask) + IA64_GRANULE_SIZE);

#endif

		return __va(md->phys_addr);
@@ -523,7 +523,7 @@ efi_init (void) 
			md = p;

			printk("mem%02u: type=%u, attr=0x%lx, range=[0x%016lx-0x%016lx) (%luMB)\n",

			       i, md->type, md->attribute, md->phys_addr,

			       md->phys_addr + (md->num_pages << EFI_PAGE_SHIFT),

			       md->phys_addr + efi_md_size(md),

			       md->num_pages >> (20 - EFI_PAGE_SHIFT));

		}

	}
@@ -656,7 +656,7 @@ efi_memory_descriptor (unsigned long phys_addr) 
	for (p = efi_map_start; p < efi_map_end; p += efi_desc_size) {

		md = p;



		if (phys_addr - md->phys_addr < (md->num_pages << EFI_PAGE_SHIFT))

		if (phys_addr - md->phys_addr < efi_md_size(md))

			 return md;

	}

	return NULL;
@@ -1158,7 +1158,7 @@ efi_initialize_iomem_resources(struct resource *code_resource, 


		res->name = name;

		res->start = md->phys_addr;

		res->end = md->phys_addr + (md->num_pages << EFI_PAGE_SHIFT) - 1;

		res->end = md->phys_addr + efi_md_size(md) - 1;

		res->flags = flags;



		if (insert_resource(&iomem_resource, res) < 0)