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

Commit 1604d9c8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6

parents a8400986 3b5cc090

Documentation/kernel-parameters.txt

+3 −0
Original line number Diff line number Diff line
@@ -758,6 +758,9 @@ running once the system is up. 
	maxcpus=	[SMP] Maximum number of processors that	an SMP kernel

			should make use of



	max_addr=[KMG]	[KNL,BOOT,ia64] All physical memory greater than or

			equal to this physical address is ignored.



	max_luns=	[SCSI] Maximum number of LUNs to probe

			Should be between 1 and 2^32-1.

arch/ia64/hp/sim/simeth.c

+4 −2
Original line number Diff line number Diff line
@@ -191,7 +191,7 @@ simeth_probe1(void) 
	unsigned char mac_addr[ETH_ALEN];

	struct simeth_local *local;

	struct net_device *dev;

	int fd, i, err;

	int fd, i, err, rc;



	/*

	 * XXX Fix me
@@ -228,7 +228,9 @@ simeth_probe1(void) 
		return err;

	}



	dev->irq = assign_irq_vector(AUTO_ASSIGN);

	if ((rc = assign_irq_vector(AUTO_ASSIGN)) < 0)

		panic("%s: out of interrupt vectors!\n", __FUNCTION__);

	dev->irq = rc;



	/*

	 * attach the interrupt in the simulator, this does enable interrupts

arch/ia64/hp/sim/simserial.c

+5 −2
Original line number Diff line number Diff line
@@ -982,7 +982,7 @@ static struct tty_operations hp_ops = { 
static int __init

simrs_init (void)

{

	int			i;

	int			i, rc;

	struct serial_state	*state;



	if (!ia64_platform_is("hpsim"))
@@ -1017,7 +1017,10 @@ simrs_init (void) 
		if (state->type == PORT_UNKNOWN) continue;



		if (!state->irq) {

			state->irq = assign_irq_vector(AUTO_ASSIGN);

			if ((rc = assign_irq_vector(AUTO_ASSIGN)) < 0)

				panic("%s: out of interrupt vectors!\n",

				      __FUNCTION__);

			state->irq = rc;

			ia64_ssc_connect_irq(KEYBOARD_INTR, state->irq);

		}

arch/ia64/kernel/entry.S

+1 −1
Original line number Diff line number Diff line
@@ -1249,7 +1249,7 @@ ENTRY(sys_rt_sigreturn) 
 	stf.spill [r17]=f11

	adds out0=16,sp				// out0 = &sigscratch

	br.call.sptk.many rp=ia64_rt_sigreturn

.ret19:	.restore sp 0

.ret19:	.restore sp,0

	adds sp=16,sp

	;;

	ld8 r9=[sp]				// load new ar.unat

arch/ia64/kernel/iosapic.c

+9 −4
Original line number Diff line number Diff line
@@ -489,8 +489,6 @@ static int iosapic_find_sharable_vector (unsigned long trigger, unsigned long po 
			}

		}

	}

	if (vector < 0)

		panic("%s: out of interrupt vectors!\n", __FUNCTION__);



	return vector;

}
@@ -506,6 +504,8 @@ iosapic_reassign_vector (int vector) 


	if (!list_empty(&iosapic_intr_info[vector].rtes)) {

		new_vector = assign_irq_vector(AUTO_ASSIGN);

		if (new_vector < 0)

			panic("%s: out of interrupt vectors!\n", __FUNCTION__);

		printk(KERN_INFO "Reassigning vector %d to %d\n", vector, new_vector);

		memcpy(&iosapic_intr_info[new_vector], &iosapic_intr_info[vector],

		       sizeof(struct iosapic_intr_info));
@@ -734,9 +734,12 @@ iosapic_register_intr (unsigned int gsi, 
	spin_unlock_irqrestore(&iosapic_lock, flags);



	/* If vector is running out, we try to find a sharable vector */

	vector = assign_irq_vector_nopanic(AUTO_ASSIGN);

	if (vector < 0)

	vector = assign_irq_vector(AUTO_ASSIGN);

	if (vector < 0) {

		vector = iosapic_find_sharable_vector(trigger, polarity);

		if (vector < 0)

			panic("%s: out of interrupt vectors!\n", __FUNCTION__);

	}



	spin_lock_irqsave(&irq_descp(vector)->lock, flags);

	spin_lock(&iosapic_lock);
@@ -884,6 +887,8 @@ iosapic_register_platform_intr (u32 int_type, unsigned int gsi, 
		break;

	      case ACPI_INTERRUPT_INIT:

		vector = assign_irq_vector(AUTO_ASSIGN);

		if (vector < 0)

			panic("%s: out of interrupt vectors!\n", __FUNCTION__);

		delivery = IOSAPIC_INIT;

		break;

	      case ACPI_INTERRUPT_CPEI: