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

Commit 71ca44da 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 ia64 kprobes compilation
  [IA64] move gcc_intrin.h from header-y to unifdef-y
  [IA64] workaround tiger ia64_sal_get_physical_id_info hang
  [IA64] move defconfig to arch/ia64/configs/
  [IA64] Fix irq migration in multiple vector domain
  [IA64] signal(ia64_ia32): add a signal stack overflow check
  [IA64] signal(ia64): add a signal stack overflow check
  [IA64] CONFIG_SGI_SN2 - auto select NUMA and ACPI_NUMA
parents 2c6f2db1 9dad6f57

arch/ia64/Kconfig

+2 −0
Original line number Original line Diff line number Diff line
@@ -156,6 +156,8 @@ config IA64_HP_ZX1_SWIOTLB 




config IA64_SGI_SN2

config IA64_SGI_SN2

	bool "SGI-SN2"

	bool "SGI-SN2"

	select NUMA

	select ACPI_NUMA

	help

	help

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

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

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

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

arch/ia64/Makefile

+2 −0
Original line number Original line Diff line number Diff line
@@ -11,6 +11,8 @@ 
# Copyright (C) 1998-2004 by David Mosberger-Tang <davidm@hpl.hp.com>

# Copyright (C) 1998-2004 by David Mosberger-Tang <davidm@hpl.hp.com>

#

#





KBUILD_DEFCONFIG := generic_defconfig



NM := $(CROSS_COMPILE)nm -B

NM := $(CROSS_COMPILE)nm -B

READELF := $(CROSS_COMPILE)readelf

READELF := $(CROSS_COMPILE)readelf

arch/ia64/defconfig→arch/ia64/configs/generic_defconfig

+0 −0

File moved.

View file

arch/ia64/ia32/ia32_signal.c

+12 −1
Original line number Original line Diff line number Diff line
@@ -766,8 +766,19 @@ get_sigframe (struct k_sigaction *ka, struct pt_regs * regs, size_t frame_size) 




	/* This is the X/Open sanctioned signal stack switching.  */

	/* This is the X/Open sanctioned signal stack switching.  */

	if (ka->sa.sa_flags & SA_ONSTACK) {

	if (ka->sa.sa_flags & SA_ONSTACK) {

		if (!on_sig_stack(esp))

		int onstack = sas_ss_flags(esp);



		if (onstack == 0)

			esp = current->sas_ss_sp + current->sas_ss_size;

			esp = current->sas_ss_sp + current->sas_ss_size;

		else if (onstack == SS_ONSTACK) {

			/*

			 * If we are on the alternate signal stack and would

			 * overflow it, don't. Return an always-bogus address

			 * instead so we will die with SIGSEGV.

			 */

			if (!likely(on_sig_stack(esp - frame_size)))

				return (void __user *) -1L;

		}

	}

	}

	/* Legacy stack switching not supported */

	/* Legacy stack switching not supported */

arch/ia64/kernel/iosapic.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -345,7 +345,7 @@ iosapic_set_affinity (unsigned int irq, cpumask_t mask) 
	if (cpus_empty(mask))

	if (cpus_empty(mask))

		return;

		return;





	if (reassign_irq_vector(irq, first_cpu(mask)))

	if (irq_prepare_move(irq, first_cpu(mask)))

		return;

		return;





	dest = cpu_physical_id(first_cpu(mask));

	dest = cpu_physical_id(first_cpu(mask));
@@ -397,6 +397,7 @@ iosapic_end_level_irq (unsigned int irq) 
	struct iosapic_rte_info *rte;

	struct iosapic_rte_info *rte;

	int do_unmask_irq = 0;

	int do_unmask_irq = 0;





	irq_complete_move(irq);

	if (unlikely(irq_desc[irq].status & IRQ_MOVE_PENDING)) {

	if (unlikely(irq_desc[irq].status & IRQ_MOVE_PENDING)) {

		do_unmask_irq = 1;

		do_unmask_irq = 1;

		mask_irq(irq);

		mask_irq(irq);
@@ -450,6 +451,7 @@ iosapic_ack_edge_irq (unsigned int irq) 
{

{

	irq_desc_t *idesc = irq_desc + irq;

	irq_desc_t *idesc = irq_desc + irq;





	irq_complete_move(irq);

	move_native_irq(irq);

	move_native_irq(irq);

	/*

	/*

	 * Once we have recorded IRQ_PENDING already, we can mask the

	 * Once we have recorded IRQ_PENDING already, we can mask the