Merge branch 'fixes' into devel (158304ef) · Commits · 戴 / test

arch/arm/Kconfig

+0 −1

Original line number	Diff line number	Diff line
		@@ -357,7 +357,6 @@ config ARCH_SA1100
		config ARCH_S3C2410
		bool "Samsung S3C2410, S3C2412, S3C2413, S3C2440, S3C2442, S3C2443"
		select GENERIC_GPIO
		select GENERIC_TIME
		help
		Samsung S3C2410X CPU based systems, such as the Simtec Electronics
		BAST (<http://www.simtec.co.uk/products/EB110ITX/>), the IPAQ 1940 or

+1 −0

Original line number	Diff line number	Diff line
		@@ -76,6 +76,7 @@ EXPORT_SYMBOL(__const_udelay);

		/* networking */
		EXPORT_SYMBOL(csum_partial);
		EXPORT_SYMBOL(csum_partial_copy_from_user);
		EXPORT_SYMBOL(csum_partial_copy_nocheck);
		EXPORT_SYMBOL(__csum_ipv6_magic);

+3 −9

Original line number	Diff line number	Diff line
		@@ -52,21 +52,15 @@ static int save_trace(struct stackframe frame, void d)
		return trace->nr_entries >= trace->max_entries;
		}

		void save_stack_trace(struct stack_trace trace, struct task_struct task)
		void save_stack_trace(struct stack_trace *trace)
		{
		struct stack_trace_data data;
		unsigned long fp, base;

		data.trace = trace;
		data.skip = trace->skip;

		if (task) {
		base = (unsigned long)task_stack_page(task);
		fp = 0; /* FIXME */
		} else {
		base = (unsigned long)task_stack_page(current);
		asm("mov %0, fp" : "=r" (fp));
		}

		walk_stackframe(fp, base, base + THREAD_SIZE, save_trace, &data);
		}

+1 −0

Original line number	Diff line number	Diff line
		@@ -43,6 +43,7 @@ obj-$(CONFIG_MACH_AT91SAM9RLEK) += board-sam9rlek.o
		# LEDs support
		led-$(CONFIG_ARCH_AT91RM9200DK) += leds.o
		led-$(CONFIG_MACH_AT91RM9200EK) += leds.o
		led-$(CONFIG_MACH_AT91SAM9261EK)+= leds.o
		led-$(CONFIG_MACH_CSB337) += leds.o
		led-$(CONFIG_MACH_CSB637) += leds.o
		led-$(CONFIG_MACH_KB9200) += leds.o

+3 −0

Original line number	Diff line number	Diff line
		@@ -60,6 +60,9 @@ static void __init ek_map_io(void)
		/* Initialize processor: 18.432 MHz crystal */
		at91sam9261_initialize(18432000);

		/* Setup the LEDs */
		at91_init_leds(AT91_PIN_PA13, AT91_PIN_PA14);

		/* Setup the serial ports and console */
		at91_init_serial(&ek_uart_config);
		}