Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 (1ed43950) · Commits · e / devices / android_kernel_fairphone_FP3

arch/ia64/ia32/sys_ia32.c

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -34,7 +34,6 @@
	#include <linux/uio.h>		#include <linux/uio.h>
	#include <linux/nfs_fs.h>		#include <linux/nfs_fs.h>
	#include <linux/quota.h>		#include <linux/quota.h>
	#include <linux/syscalls.h>
	#include <linux/sunrpc/svc.h>		#include <linux/sunrpc/svc.h>
	#include <linux/nfsd/nfsd.h>		#include <linux/nfsd/nfsd.h>
	#include <linux/nfsd/cache.h>		#include <linux/nfsd/cache.h>

arch/ia64/kernel/iosapic.c

+10 −9

Original line number	Original line	Diff line number	Diff line
	@@ -142,7 +142,7 @@ struct iosapic_rte_info {
	static struct iosapic_intr_info {		static struct iosapic_intr_info {
	struct list_head rtes; /* RTEs using this vector (empty =>		struct list_head rtes; /* RTEs using this vector (empty =>
	* not an IOSAPIC interrupt) */		* not an IOSAPIC interrupt) */
	int count; /* # of RTEs that shares this vector */		int count; /* # of registered RTEs */
	u32 low32; /* current value of low word of		u32 low32; /* current value of low word of
	* Redirection table entry */		* Redirection table entry */
	unsigned int dest; /* destination CPU physical ID */		unsigned int dest; /* destination CPU physical ID */
	@@ -313,7 +313,7 @@ mask_irq (unsigned int irq)
	int rte_index;		int rte_index;
	struct iosapic_rte_info *rte;		struct iosapic_rte_info *rte;

	if (list_empty(&iosapic_intr_info[irq].rtes))		if (!iosapic_intr_info[irq].count)
	return; /* not an IOSAPIC interrupt! */		return; /* not an IOSAPIC interrupt! */

	/* set only the mask bit */		/* set only the mask bit */
	@@ -331,7 +331,7 @@ unmask_irq (unsigned int irq)
	int rte_index;		int rte_index;
	struct iosapic_rte_info *rte;		struct iosapic_rte_info *rte;

	if (list_empty(&iosapic_intr_info[irq].rtes))		if (!iosapic_intr_info[irq].count)
	return; /* not an IOSAPIC interrupt! */		return; /* not an IOSAPIC interrupt! */

	low32 = iosapic_intr_info[irq].low32 &= ~IOSAPIC_MASK;		low32 = iosapic_intr_info[irq].low32 &= ~IOSAPIC_MASK;
	@@ -363,7 +363,7 @@ iosapic_set_affinity (unsigned int irq, cpumask_t mask)

	dest = cpu_physical_id(first_cpu(mask));		dest = cpu_physical_id(first_cpu(mask));

	if (list_empty(&iosapic_intr_info[irq].rtes))		if (!iosapic_intr_info[irq].count)
	return; /* not an IOSAPIC interrupt */		return; /* not an IOSAPIC interrupt */

	set_irq_affinity_info(irq, dest, redir);		set_irq_affinity_info(irq, dest, redir);
	@@ -542,7 +542,7 @@ iosapic_reassign_vector (int irq)
	{		{
	int new_irq;		int new_irq;

	if (!list_empty(&iosapic_intr_info[irq].rtes)) {		if (iosapic_intr_info[irq].count) {
	new_irq = create_irq();		new_irq = create_irq();
	if (new_irq < 0)		if (new_irq < 0)
	panic("%s: out of interrupt vectors!\n", __FUNCTION__);		panic("%s: out of interrupt vectors!\n", __FUNCTION__);
	@@ -560,7 +560,7 @@ iosapic_reassign_vector (int irq)
	}		}
	}		}

	static struct iosapic_rte_info *iosapic_alloc_rte (void)		static struct iosapic_rte_info * __init_refok iosapic_alloc_rte (void)
	{		{
	int i;		int i;
	struct iosapic_rte_info *rte;		struct iosapic_rte_info *rte;
	@@ -677,7 +677,7 @@ get_target_cpu (unsigned int gsi, int irq)
	* In case of vector shared by multiple RTEs, all RTEs that		* In case of vector shared by multiple RTEs, all RTEs that
	* share the vector need to use the same destination CPU.		* share the vector need to use the same destination CPU.
	*/		*/
	if (!list_empty(&iosapic_intr_info[irq].rtes))		if (iosapic_intr_info[irq].count)
	return iosapic_intr_info[irq].dest;		return iosapic_intr_info[irq].dest;

	/*		/*
	@@ -794,8 +794,9 @@ iosapic_register_intr (unsigned int gsi,
	err = register_intr(gsi, irq, IOSAPIC_LOWEST_PRIORITY,		err = register_intr(gsi, irq, IOSAPIC_LOWEST_PRIORITY,
	polarity, trigger);		polarity, trigger);
	if (err < 0) {		if (err < 0) {
			spin_unlock(&irq_desc[irq].lock);
	irq = err;		irq = err;
	goto unlock_all;		goto unlock_iosapic_lock;
	}		}

	/*		/*
	@@ -811,7 +812,7 @@ iosapic_register_intr (unsigned int gsi,
	gsi, (trigger == IOSAPIC_EDGE ? "edge" : "level"),		gsi, (trigger == IOSAPIC_EDGE ? "edge" : "level"),
	(polarity == IOSAPIC_POL_HIGH ? "high" : "low"),		(polarity == IOSAPIC_POL_HIGH ? "high" : "low"),
	cpu_logical_id(dest), dest, irq_to_vector(irq));		cpu_logical_id(dest), dest, irq_to_vector(irq));
	unlock_all:
	spin_unlock(&irq_desc[irq].lock);		spin_unlock(&irq_desc[irq].lock);
	unlock_iosapic_lock:		unlock_iosapic_lock:
	spin_unlock_irqrestore(&iosapic_lock, flags);		spin_unlock_irqrestore(&iosapic_lock, flags);

arch/ia64/kernel/irq_ia64.c

+6 −11

Original line number	Original line	Diff line number	Diff line
	@@ -101,15 +101,6 @@ int check_irq_used(int irq)
	return -1;		return -1;
	}		}

	static void reserve_irq(unsigned int irq)
	{
	unsigned long flags;

	spin_lock_irqsave(&vector_lock, flags);
	irq_status[irq] = IRQ_RSVD;
	spin_unlock_irqrestore(&vector_lock, flags);
	}

	static inline int find_unassigned_irq(void)		static inline int find_unassigned_irq(void)
	{		{
	int irq;		int irq;
	@@ -302,10 +293,14 @@ static cpumask_t vector_allocation_domain(int cpu)

	void destroy_and_reserve_irq(unsigned int irq)		void destroy_and_reserve_irq(unsigned int irq)
	{		{
			unsigned long flags;

	dynamic_irq_cleanup(irq);		dynamic_irq_cleanup(irq);

	clear_irq_vector(irq);		spin_lock_irqsave(&vector_lock, flags);
	reserve_irq(irq);		__clear_irq_vector(irq);
			irq_status[irq] = IRQ_RSVD;
			spin_unlock_irqrestore(&vector_lock, flags);
	}		}

	static int __reassign_irq_vector(int irq, int cpu)		static int __reassign_irq_vector(int irq, int cpu)

arch/ia64/kernel/mca.c

+11 −6

Original line number	Original line	Diff line number	Diff line
	@@ -1750,8 +1750,17 @@ format_mca_init_stack(void *mca_data, unsigned long offset,
	strncpy(p->comm, type, sizeof(p->comm)-1);		strncpy(p->comm, type, sizeof(p->comm)-1);
	}		}

	/* Do per-CPU MCA-related initialization. */		/* Caller prevents this from being called after init */
			static void * __init_refok mca_bootmem(void)
			{
			void *p;

			p = alloc_bootmem(sizeof(struct ia64_mca_cpu) * NR_CPUS +
			KERNEL_STACK_SIZE);
			return (void *)ALIGN((unsigned long)p, KERNEL_STACK_SIZE);
			}

			/* Do per-CPU MCA-related initialization. */
	void __cpuinit		void __cpuinit
	ia64_mca_cpu_init(void *cpu_data)		ia64_mca_cpu_init(void *cpu_data)
	{		{
	@@ -1763,11 +1772,7 @@ ia64_mca_cpu_init(void *cpu_data)
	int cpu;		int cpu;

	first_time = 0;		first_time = 0;
	mca_data = alloc_bootmem(sizeof(struct ia64_mca_cpu)		mca_data = mca_bootmem();
	* NR_CPUS + KERNEL_STACK_SIZE);
	mca_data = (void *)(((unsigned long)mca_data +
	KERNEL_STACK_SIZE - 1) &
	(-KERNEL_STACK_SIZE));
	for (cpu = 0; cpu < NR_CPUS; cpu++) {		for (cpu = 0; cpu < NR_CPUS; cpu++) {
	format_mca_init_stack(mca_data,		format_mca_init_stack(mca_data,
	offsetof(struct ia64_mca_cpu, mca_stack),		offsetof(struct ia64_mca_cpu, mca_stack),

arch/ia64/kernel/setup.c

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -60,7 +60,6 @@
	#include <asm/smp.h>		#include <asm/smp.h>
	#include <asm/system.h>		#include <asm/system.h>
	#include <asm/unistd.h>		#include <asm/unistd.h>
	#include <asm/system.h>

	#if defined(CONFIG_SMP) && (IA64_CPU_SIZE > PAGE_SIZE)		#if defined(CONFIG_SMP) && (IA64_CPU_SIZE > PAGE_SIZE)
	# error "struct cpuinfo_ia64 too big!"		# error "struct cpuinfo_ia64 too big!"