Commit 9ca0e547 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/home/rmk/linux-2.6-arm 

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 3914/1: [Jornada7xx] - Typo Fix in cpu-sa1110.c (b != B)
  [ARM] 3913/1: n2100: fix IRQ routing for second ethernet port
  [ARM] Add KBUILD_IMAGE target support
  [ARM] Fix suspend oops caused by PXA2xx PCMCIA driver
  [ARM] Fix i2c-pxa slave mode support
  [ARM] 3900/1: Fix VFP Division by Zero exception handling.
  [ARM] 3899/1: Fix the normalization of the denormal double precision number.
  [ARM] 3909/1: Disable UWIND_INFO for ARM (again)
  [ARM] Add __must_check to uaccess functions
  [ARM] Add realview SMP default configuration
  [ARM] Fix SMP irqflags support
parents c0f79c4c 9f0f9313

arch/arm/Makefile

+4 −2
Original line number Diff line number Diff line
@@ -174,11 +174,13 @@ libs-y := arch/arm/lib/ $(libs-y) 


# Default target when executing plain make

ifeq ($(CONFIG_XIP_KERNEL),y)

all: xipImage

KBUILD_IMAGE := xipImage

else

all: zImage

KBUILD_IMAGE := zImage

endif



all:	$(KBUILD_IMAGE)



boot := arch/arm/boot



#	Update machine arch and proc symlinks if something which affects

arch/arm/configs/realview-smp_defconfig

0 → 100644
+994 −0

File added.

Preview size limit exceeded, changes collapsed.

arch/arm/kernel/smp.c

+13 −7
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */

#include <linux/module.h>

#include <linux/delay.h>

#include <linux/init.h>

#include <linux/spinlock.h>
@@ -19,6 +20,7 @@ 
#include <linux/cpu.h>

#include <linux/smp.h>

#include <linux/seq_file.h>

#include <linux/irq.h>



#include <asm/atomic.h>

#include <asm/cacheflush.h>
@@ -474,25 +476,26 @@ void show_local_irqs(struct seq_file *p) 
	seq_putc(p, '\n');

}



static void ipi_timer(struct pt_regs *regs)

static void ipi_timer(void)

{

	int user = user_mode(regs);



	irq_enter();

	profile_tick(CPU_PROFILING, regs);

	update_process_times(user);

	profile_tick(CPU_PROFILING);

	update_process_times(user_mode(get_irq_regs()));

	irq_exit();

}



#ifdef CONFIG_LOCAL_TIMERS

asmlinkage void do_local_timer(struct pt_regs *regs)

{

	struct pt_regs *old_regs = set_irq_regs(regs);

	int cpu = smp_processor_id();



	if (local_timer_ack()) {

		irq_stat[cpu].local_timer_irqs++;

		ipi_timer(regs);

		ipi_timer();

	}



	set_irq_regs(old_regs);

}

#endif
@@ -551,6 +554,7 @@ asmlinkage void do_IPI(struct pt_regs *regs) 
{

	unsigned int cpu = smp_processor_id();

	struct ipi_data *ipi = &per_cpu(ipi_data, cpu);

	struct pt_regs *old_regs = set_irq_regs(regs);



	ipi->ipi_count++;
@@ -574,7 +578,7 @@ asmlinkage void do_IPI(struct pt_regs *regs) 


			switch (nextmsg) {

			case IPI_TIMER:

				ipi_timer(regs);

				ipi_timer();

				break;



			case IPI_RESCHEDULE:
@@ -599,6 +603,8 @@ asmlinkage void do_IPI(struct pt_regs *regs) 
			}

		} while (msgs);

	}



	set_irq_regs(old_regs);

}



void smp_send_reschedule(int cpu)

arch/arm/kernel/time.c

+1 −2
Original line number Diff line number Diff line
@@ -327,13 +327,12 @@ EXPORT_SYMBOL(restore_time_delta); 
 */

void timer_tick(void)

{

	struct pt_regs *regs = get_irq_regs();

	profile_tick(CPU_PROFILING);

	do_leds();

	do_set_rtc();

	do_timer(1);

#ifndef CONFIG_SMP

	update_process_times(user_mode(regs));

	update_process_times(user_mode(get_irq_regs()));

#endif

}

arch/arm/mach-iop32x/n2100.c

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ n2100_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin) 
		irq = IRQ_IOP32X_XINT0;

	} else if (PCI_SLOT(dev->devfn) == 2) {

		/* RTL8110SB #2 */

		irq = IRQ_IOP32X_XINT1;

		irq = IRQ_IOP32X_XINT3;

	} else if (PCI_SLOT(dev->devfn) == 3) {

		/* Sil3512 */

		irq = IRQ_IOP32X_XINT2;

CRA Git | Maintained and supported by SUSTech CRA and CCSE