Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 (bf164c79) · Commits · e / devices / android_kernel_teracube_2e

Documentation/serial/driver

+2 −2

Original line number	Diff line number	Diff line
		@@ -107,8 +107,8 @@ hardware.
		indicate that the signal is permanently active. If RI is
		not available, the signal should not be indicated as active.

		Locking: none.
		Interrupts: caller dependent.
		Locking: port->lock taken.
		Interrupts: locally disabled.
		This call must not sleep

		stop_tx(port,tty_stop)

arch/arm/kernel/armksyms.c

+0 −6

Original line number	Diff line number	Diff line
		@@ -30,9 +30,6 @@ extern void __lshrdi3(void);
		extern void __modsi3(void);
		extern void __muldi3(void);
		extern void __ucmpdi2(void);
		extern void __udivdi3(void);
		extern void __umoddi3(void);
		extern void __udivmoddi4(void);
		extern void __udivsi3(void);
		extern void __umodsi3(void);
		extern void __do_div64(void);
		@@ -134,9 +131,6 @@ EXPORT_SYMBOL(__lshrdi3);
		EXPORT_SYMBOL(__modsi3);
		EXPORT_SYMBOL(__muldi3);
		EXPORT_SYMBOL(__ucmpdi2);
		EXPORT_SYMBOL(__udivdi3);
		EXPORT_SYMBOL(__umoddi3);
		EXPORT_SYMBOL(__udivmoddi4);
		EXPORT_SYMBOL(__udivsi3);
		EXPORT_SYMBOL(__umodsi3);
		EXPORT_SYMBOL(__do_div64);

arch/arm/kernel/setup.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -359,7 +359,8 @@ void cpu_init(void)
		"I" (offsetof(struct stack, abt[0])),
		"I" (PSR_F_BIT \| PSR_I_BIT \| UND_MODE),
		"I" (offsetof(struct stack, und[0])),
		"I" (PSR_F_BIT \| PSR_I_BIT \| SVC_MODE));
		"I" (PSR_F_BIT \| PSR_I_BIT \| SVC_MODE)
		: "r14");
		}

		static struct machine_desc * __init setup_machine(unsigned int nr)

arch/arm/kernel/smp.c

+123 −0

Original line number	Diff line number	Diff line
		@@ -502,3 +502,126 @@ int __init setup_profiling_timer(unsigned int multiplier)
		{
		return -EINVAL;
		}

		static int
		on_each_cpu_mask(void (func)(void ), void *info, int retry, int wait,
		cpumask_t mask)
		{
		int ret = 0;

		preempt_disable();

		ret = smp_call_function_on_cpu(func, info, retry, wait, mask);
		if (cpu_isset(smp_processor_id(), mask))
		func(info);

		preempt_enable();

		return ret;
		}

		/**********************************************************************/

		/*
		* TLB operations
		*/
		struct tlb_args {
		struct vm_area_struct *ta_vma;
		unsigned long ta_start;
		unsigned long ta_end;
		};

		static inline void ipi_flush_tlb_all(void *ignored)
		{
		local_flush_tlb_all();
		}

		static inline void ipi_flush_tlb_mm(void *arg)
		{
		struct mm_struct mm = (struct mm_struct )arg;

		local_flush_tlb_mm(mm);
		}

		static inline void ipi_flush_tlb_page(void *arg)
		{
		struct tlb_args ta = (struct tlb_args )arg;

		local_flush_tlb_page(ta->ta_vma, ta->ta_start);
		}

		static inline void ipi_flush_tlb_kernel_page(void *arg)
		{
		struct tlb_args ta = (struct tlb_args )arg;

		local_flush_tlb_kernel_page(ta->ta_start);
		}

		static inline void ipi_flush_tlb_range(void *arg)
		{
		struct tlb_args ta = (struct tlb_args )arg;

		local_flush_tlb_range(ta->ta_vma, ta->ta_start, ta->ta_end);
		}

		static inline void ipi_flush_tlb_kernel_range(void *arg)
		{
		struct tlb_args ta = (struct tlb_args )arg;

		local_flush_tlb_kernel_range(ta->ta_start, ta->ta_end);
		}

		void flush_tlb_all(void)
		{
		on_each_cpu(ipi_flush_tlb_all, NULL, 1, 1);
		}

		void flush_tlb_mm(struct mm_struct *mm)
		{
		cpumask_t mask = mm->cpu_vm_mask;

		on_each_cpu_mask(ipi_flush_tlb_mm, mm, 1, 1, mask);
		}

		void flush_tlb_page(struct vm_area_struct *vma, unsigned long uaddr)
		{
		cpumask_t mask = vma->vm_mm->cpu_vm_mask;
		struct tlb_args ta;

		ta.ta_vma = vma;
		ta.ta_start = uaddr;

		on_each_cpu_mask(ipi_flush_tlb_page, &ta, 1, 1, mask);
		}

		void flush_tlb_kernel_page(unsigned long kaddr)
		{
		struct tlb_args ta;

		ta.ta_start = kaddr;

		on_each_cpu(ipi_flush_tlb_kernel_page, &ta, 1, 1);
		}

		void flush_tlb_range(struct vm_area_struct *vma,
		unsigned long start, unsigned long end)
		{
		cpumask_t mask = vma->vm_mm->cpu_vm_mask;
		struct tlb_args ta;

		ta.ta_vma = vma;
		ta.ta_start = start;
		ta.ta_end = end;

		on_each_cpu_mask(ipi_flush_tlb_range, &ta, 1, 1, mask);
		}

		void flush_tlb_kernel_range(unsigned long start, unsigned long end)
		{
		struct tlb_args ta;

		ta.ta_start = start;
		ta.ta_end = end;

		on_each_cpu(ipi_flush_tlb_kernel_range, &ta, 1, 1);
		}

arch/arm/lib/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -11,7 +11,7 @@ lib-y := backtrace.o changebit.o csumipv6.o csumpartial.o \
		strnlen_user.o strchr.o strrchr.o testchangebit.o \
		testclearbit.o testsetbit.o uaccess.o getuser.o \
		putuser.o ashldi3.o ashrdi3.o lshrdi3.o muldi3.o \
		ucmpdi2.o udivdi3.o lib1funcs.o div64.o \
		ucmpdi2.o lib1funcs.o div64.o \
		io-readsb.o io-writesb.o io-readsl.o io-writesl.o

		ifeq ($(CONFIG_CPU_32v3),y)