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

Commit 7371fd11 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 personality(PER_LINUX32) performance issue
  [IA64] Properly unregister legacy interrupts
  [IA64] Remove NULL pointer check for argument never passed as NULL.
  [IA64] trivial cleanup for perfmon.c
  [IA64] trivial cleanup for entry.S
  [IA64] fix interrupt masking for pending works on kernel leave
  [IA64] allow user to force_pal_cache_flush
  [IA64] Don't reserve crashkernel memory > 4 GB
  [IA64] machvec support for SGI UV platform
  [IA64] Add header files for SGI UV platform
parents 487ad7ef 839052d2

Documentation/kernel-parameters.txt

+6 −0
Original line number Diff line number Diff line
@@ -686,6 +686,12 @@ and is between 256 and 4096 characters. It is defined in the file 
	floppy=		[HW]

			See Documentation/floppy.txt.



	force_pal_cache_flush

			[IA-64] Avoid check_sal_cache_flush which may hang on

			buggy SAL_CACHE_FLUSH implementations. Using this

			parameter will force ia64_sal_cache_flush to call

			ia64_pal_cache_flush instead of SAL_CACHE_FLUSH.



	gamecon.map[2|3]=

			[HW,JOY] Multisystem joystick and NES/SNES/PSX pad

			support via parallel port (up to 5 devices per port)

arch/ia64/Kconfig

+13 −0
Original line number Diff line number Diff line
@@ -135,6 +135,7 @@ config IA64_GENERIC 
	  HP-zx1/sx1000		For HP systems

	  HP-zx1/sx1000+swiotlb	For HP systems with (broken) DMA-constrained devices.

	  SGI-SN2		For SGI Altix systems

	  SGI-UV		For SGI UV systems

	  Ski-simulator		For the HP simulator <http://www.hpl.hp.com/research/linux/ski/>



	  If you don't know what to do, choose "generic".
@@ -170,6 +171,18 @@ config IA64_SGI_SN2 
	  to select this option.  If in doubt, select ia64 generic support

	  instead.



config IA64_SGI_UV`

	bool "SGI-UV`"

	select NUMA

	select ACPI_NUMA

	select SWIOTLB

	help

	  Selecting this option will optimize the kernel for use on UV based

	  systems, but the resulting kernel binary will not run on other

	  types of ia64 systems.  If you have an SGI UV system, it's safe

	  to select this option.  If in doubt, select ia64 generic support

	  instead.



config IA64_HP_SIM

	bool "Ski-simulator"

	select SWIOTLB

arch/ia64/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ drivers-$(CONFIG_PCI) += arch/ia64/pci/ 
drivers-$(CONFIG_IA64_HP_SIM)	+= arch/ia64/hp/sim/

drivers-$(CONFIG_IA64_HP_ZX1)	+= arch/ia64/hp/common/ arch/ia64/hp/zx1/

drivers-$(CONFIG_IA64_HP_ZX1_SWIOTLB) += arch/ia64/hp/common/ arch/ia64/hp/zx1/

drivers-$(CONFIG_IA64_GENERIC)	+= arch/ia64/hp/common/ arch/ia64/hp/zx1/ arch/ia64/hp/sim/ arch/ia64/sn/

drivers-$(CONFIG_IA64_GENERIC)	+= arch/ia64/hp/common/ arch/ia64/hp/zx1/ arch/ia64/hp/sim/ arch/ia64/sn/ arch/ia64/uv/

drivers-$(CONFIG_OPROFILE)	+= arch/ia64/oprofile/



boot := arch/ia64/hp/sim/boot

arch/ia64/ia32/ia32_support.c

+0 −10
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/mm.h>

#include <linux/personality.h>

#include <linux/sched.h>



#include <asm/intrinsics.h>
@@ -29,7 +28,6 @@ 


extern int die_if_kernel (char *str, struct pt_regs *regs, long err);



struct exec_domain ia32_exec_domain;

struct page *ia32_shared_page[NR_CPUS];

unsigned long *ia32_boot_gdt;

unsigned long *cpu_gdt_table[NR_CPUS];
@@ -240,14 +238,6 @@ ia32_cpu_init (void) 
static int __init

ia32_init (void)

{

	ia32_exec_domain.name = "Linux/x86";

	ia32_exec_domain.handler = NULL;

	ia32_exec_domain.pers_low = PER_LINUX32;

	ia32_exec_domain.pers_high = PER_LINUX32;

	ia32_exec_domain.signal_map = default_exec_domain.signal_map;

	ia32_exec_domain.signal_invmap = default_exec_domain.signal_invmap;

	register_exec_domain(&ia32_exec_domain);



#if PAGE_SHIFT > IA32_PAGE_SHIFT

	{

		extern struct kmem_cache *ia64_partial_page_cachep;

arch/ia64/kernel/acpi.c

+9 −1
Original line number Diff line number Diff line
@@ -117,6 +117,9 @@ acpi_get_sysname(void) 
	if (!strcmp(hdr->oem_id, "HP")) {

		return "hpzx1";

	} else if (!strcmp(hdr->oem_id, "SGI")) {

		if (!strcmp(hdr->oem_table_id + 4, "UV"))

			return "uv";

		else

			return "sn2";

	}
@@ -130,6 +133,8 @@ acpi_get_sysname(void) 
	return "hpzx1_swiotlb";

# elif defined (CONFIG_IA64_SGI_SN2)

	return "sn2";

# elif defined (CONFIG_IA64_SGI_UV)

	return "uv";

# elif defined (CONFIG_IA64_DIG)

	return "dig";

# else
@@ -622,6 +627,9 @@ void acpi_unregister_gsi(u32 gsi) 
	if (acpi_irq_model == ACPI_IRQ_MODEL_PLATFORM)

		return;



	if (has_8259 && gsi < 16)

		return;



	iosapic_unregister_intr(gsi);

}