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

Commit 0670afdf 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: (27 commits)
  [IA64] swiotlb abstraction (e.g. for Xen)
  [IA64] swiotlb cleanup
  [IA64] make swiotlb use bus_to_virt/virt_to_bus
  [IA64] swiotlb bug fixes
  [IA64] Hook up getcpu system call for IA64
  [IA64] clean up sparsemem memory_present call
  [IA64] show_mem() for IA64 sparsemem NUMA
  [IA64] missing exports hwsw_sync_...
  [IA64] virt_to_page() can be called with NULL arg
  [IA64] alignment bug in ldscript
  [IA64] register memory ranges in a consistent manner
  [IA64] Enable SWIOTLB only when needed
  [IA64-SGI] Check for TIO errors on shub2 Altix
  [IA64] remove bogus prototype ia64_esi_init()
  [IA64] Clear IRQ affinity when unregistered
  [IA64] fix ACPI Kconfig issues
  [IA64] Fix NULL-pointer dereference in ia64_machine_kexec()
  [IA64] find thread for user rbs address
  [IA64] use snprintf() on features field of /proc/cpuinfo
  [IA64] enable singlestep on system call
  ...
parents dda2ac15 51099005

arch/ia64/Kconfig

+6 −3
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ menu "Processor type and features" 


config IA64

	bool

	select PCI if (!IA64_HP_SIM)

	select ACPI if (!IA64_HP_SIM)

	default y

	help

	  The Itanium Processor Family is Intel's 64-bit successor to
@@ -28,7 +30,6 @@ config MMU 


config SWIOTLB

       bool

       default y



config RWSEM_XCHGADD_ALGORITHM

	bool
@@ -84,10 +85,9 @@ choice 


config IA64_GENERIC

	bool "generic"

	select ACPI

	select PCI

	select NUMA

	select ACPI_NUMA

	select SWIOTLB

	help

	  This selects the system type of your hardware.  A "generic" kernel

	  will run on any supported IA-64 system.  However, if you configure
@@ -104,6 +104,7 @@ config IA64_GENERIC 


config IA64_DIG

	bool "DIG-compliant"

	select SWIOTLB



config IA64_HP_ZX1

	bool "HP-zx1/sx1000"
@@ -113,6 +114,7 @@ config IA64_HP_ZX1 


config IA64_HP_ZX1_SWIOTLB

	bool "HP-zx1/sx1000 with software I/O TLB"

	select SWIOTLB

	help

	  Build a kernel that runs on HP zx1 and sx1000 systems even when they

	  have broken PCI devices which cannot DMA to full 32 bits.  Apart
@@ -131,6 +133,7 @@ config IA64_SGI_SN2 


config IA64_HP_SIM

	bool "Ski-simulator"

	select SWIOTLB



endchoice

arch/ia64/hp/common/hwsw_iommu.c

+4 −0
Original line number Diff line number Diff line
@@ -192,3 +192,7 @@ EXPORT_SYMBOL(hwsw_unmap_sg); 
EXPORT_SYMBOL(hwsw_dma_supported);

EXPORT_SYMBOL(hwsw_alloc_coherent);

EXPORT_SYMBOL(hwsw_free_coherent);

EXPORT_SYMBOL(hwsw_sync_single_for_cpu);

EXPORT_SYMBOL(hwsw_sync_single_for_device);

EXPORT_SYMBOL(hwsw_sync_sg_for_cpu);

EXPORT_SYMBOL(hwsw_sync_sg_for_device);

arch/ia64/kernel/crash.c

+12 −4
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ crash_save_this_cpu() 
	final_note(buf);

}



#ifdef CONFIG_SMP

static int

kdump_wait_cpu_freeze(void)

{
@@ -91,6 +92,7 @@ kdump_wait_cpu_freeze(void) 
	}

	return 1;

}

#endif



void

machine_crash_shutdown(struct pt_regs *pt)
@@ -116,6 +118,11 @@ machine_crash_shutdown(struct pt_regs *pt) 
static void

machine_kdump_on_init(void)

{

	if (!ia64_kimage) {

		printk(KERN_NOTICE "machine_kdump_on_init(): "

				"kdump not configured\n");

		return;

	}

	local_irq_disable();

	kexec_disable_iosapic();

	machine_kexec(ia64_kimage);
@@ -132,11 +139,12 @@ kdump_cpu_freeze(struct unw_frame_info *info, void *arg) 
	atomic_inc(&kdump_cpu_freezed);

	kdump_status[cpuid] = 1;

	mb();

	if (cpuid == 0) {

#ifdef CONFIG_HOTPLUG_CPU

	if (cpuid != 0)

		ia64_jump_to_sal(&sal_boot_rendez_state[cpuid]);

#endif

	for (;;)

		cpu_relax();

	} else

		ia64_jump_to_sal(&sal_boot_rendez_state[cpuid]);

}



static int

arch/ia64/kernel/crash_dump.c

+2 −1
Original line number Diff line number Diff line
@@ -9,7 +9,8 @@ 
#include <linux/errno.h>

#include <linux/types.h>



#include <linux/uaccess.h>

#include <asm/page.h>

#include <asm/uaccess.h>



/**

 * copy_oldmem_page - copy one page from "oldmem"

arch/ia64/kernel/efi.c

+1 −1
Original line number Diff line number Diff line
@@ -380,7 +380,7 @@ efi_get_pal_addr (void) 
#endif

		return __va(md->phys_addr);

	}

	printk(KERN_WARNING "%s: no PAL-code memory-descriptor found",

	printk(KERN_WARNING "%s: no PAL-code memory-descriptor found\n",

	       __FUNCTION__);

	return NULL;

}