Pull for-2.6.31 into release (27f70c31) · Commits · e / devices / android_kernel_teracube_mt6765

arch/ia64/hp/common/sba_iommu.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1787,7 +1787,7 @@ static struct ioc_iommu ioc_iommu_info[] __initdata = {
		};

		static struct ioc * __init
		ioc_init(u64 hpa, void *handle)
		ioc_init(unsigned long hpa, void *handle)
		{
		struct ioc *ioc;
		struct ioc_iommu *info;

arch/ia64/hp/sim/hpsim_irq.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -27,7 +27,7 @@ hpsim_set_affinity_noop(unsigned int a, const struct cpumask *b)
		return 0;
		}

		static struct hw_interrupt_type irq_type_hp_sim = {
		static struct irq_chip irq_type_hp_sim = {
		.name = "hpsim",
		.startup = hpsim_irq_startup,
		.shutdown = hpsim_irq_noop,
		@@ -41,12 +41,12 @@ static struct hw_interrupt_type irq_type_hp_sim = {
		void __init
		hpsim_irq_init (void)
		{
		irq_desc_t *idesc;
		struct irq_desc *idesc;
		int i;

		for (i = 0; i < NR_IRQS; ++i) {
		idesc = irq_desc + i;
		if (idesc->chip == &no_irq_type)
		if (idesc->chip == &no_irq_chip)
		idesc->chip = &irq_type_hp_sim;
		}
		}

arch/ia64/include/asm/Kbuild

+0 −1

Original line number	Diff line number	Diff line
		@@ -2,7 +2,6 @@ include include/asm-generic/Kbuild.asm

		header-y += break.h
		header-y += fpu.h
		header-y += fpswa.h
		header-y += ia64regs.h
		header-y += intel_intrin.h
		header-y += perfmon_default_smpl.h

arch/ia64/include/asm/gcc_intrin.h

+9 −9

Original line number	Diff line number	Diff line
		@@ -388,7 +388,7 @@ register unsigned long ia64_r13 asm ("r13") __used;

		#define ia64_native_thash(addr) \
		({ \
		__u64 ia64_intri_res; \
		unsigned long ia64_intri_res; \
		asm volatile ("thash %0=%1" : "=r"(ia64_intri_res) : "r" (addr)); \
		ia64_intri_res; \
		})
		@@ -419,7 +419,7 @@ register unsigned long ia64_r13 asm ("r13") __used;

		#define ia64_tpa(addr) \
		({ \
		__u64 ia64_pa; \
		unsigned long ia64_pa; \
		asm volatile ("tpa %0 = %1" : "=r"(ia64_pa) : "r"(addr) : "memory"); \
		ia64_pa; \
		})
		@@ -444,35 +444,35 @@ register unsigned long ia64_r13 asm ("r13") __used;

		#define ia64_native_get_cpuid(index) \
		({ \
		__u64 ia64_intri_res; \
		unsigned long ia64_intri_res; \
		asm volatile ("mov %0=cpuid[%r1]" : "=r"(ia64_intri_res) : "rO"(index)); \
		ia64_intri_res; \
		})

		#define __ia64_get_dbr(index) \
		({ \
		__u64 ia64_intri_res; \
		unsigned long ia64_intri_res; \
		asm volatile ("mov %0=dbr[%1]" : "=r"(ia64_intri_res) : "r"(index)); \
		ia64_intri_res; \
		})

		#define ia64_get_ibr(index) \
		({ \
		__u64 ia64_intri_res; \
		unsigned long ia64_intri_res; \
		asm volatile ("mov %0=ibr[%1]" : "=r"(ia64_intri_res) : "r"(index)); \
		ia64_intri_res; \
		})

		#define ia64_get_pkr(index) \
		({ \
		__u64 ia64_intri_res; \
		unsigned long ia64_intri_res; \
		asm volatile ("mov %0=pkr[%1]" : "=r"(ia64_intri_res) : "r"(index)); \
		ia64_intri_res; \
		})

		#define ia64_get_pmc(index) \
		({ \
		__u64 ia64_intri_res; \
		unsigned long ia64_intri_res; \
		asm volatile ("mov %0=pmc[%1]" : "=r"(ia64_intri_res) : "r"(index)); \
		ia64_intri_res; \
		})
		@@ -480,14 +480,14 @@ register unsigned long ia64_r13 asm ("r13") __used;

		#define ia64_native_get_pmd(index) \
		({ \
		__u64 ia64_intri_res; \
		unsigned long ia64_intri_res; \
		asm volatile ("mov %0=pmd[%1]" : "=r"(ia64_intri_res) : "r"(index)); \
		ia64_intri_res; \
		})

		#define ia64_native_get_rr(index) \
		({ \
		__u64 ia64_intri_res; \
		unsigned long ia64_intri_res; \
		asm volatile ("mov %0=rr[%1]" : "=r"(ia64_intri_res) : "r" (index)); \
		ia64_intri_res; \
		})

arch/ia64/include/asm/hw_irq.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -106,7 +106,7 @@ extern struct irq_cfg irq_cfg[NR_IRQS];
		#define irq_to_domain(x) irq_cfg[(x)].domain
		DECLARE_PER_CPU(int[IA64_NUM_VECTORS], vector_irq);

		extern struct hw_interrupt_type irq_type_ia64_lsapic; /* CPU-internal interrupt controller */
		extern struct irq_chip irq_type_ia64_lsapic; /* CPU-internal interrupt controller */

		#ifdef CONFIG_PARAVIRT_GUEST
		#include <asm/paravirt.h>
		@@ -146,7 +146,7 @@ static inline void ia64_native_resend_irq(unsigned int vector)
		* Default implementations for the irq-descriptor API:
		*/

		extern irq_desc_t irq_desc[NR_IRQS];
		extern struct irq_desc irq_desc[NR_IRQS];

		#ifndef CONFIG_IA64_GENERIC
		static inline ia64_vector __ia64_irq_to_vector(int irq)