Merge branch 'sh/for-2.6.32' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 (a314b0cf) · Commits · 戴 / test

arch/sh/include/asm/rwsem.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -41,7 +41,7 @@ struct rw_semaphore {
		#endif

		#define __RWSEM_INITIALIZER(name) \
		{ RWSEM_UNLOCKED_VALUE, SPIN_LOCK_UNLOCKED, \
		{ RWSEM_UNLOCKED_VALUE, __SPIN_LOCK_UNLOCKED((name).wait_lock), \
		LIST_HEAD_INIT((name).wait_list) \
		__RWSEM_DEP_MAP_INIT(name) }

+1 −1

Original line number	Diff line number	Diff line
		@@ -555,7 +555,7 @@ struct dwarf_frame * dwarf_unwind_stack(unsigned long pc,
		* NOTE: the return address is guaranteed to be setup by the
		* time this function makes its first function call.
		*/
		if (!pc && !prev)
		if (!pc \|\| !prev)
		pc = (unsigned long)current_text_addr();

		#ifdef CONFIG_FUNCTION_GRAPH_TRACER

+4 −1

Original line number	Diff line number	Diff line
		@@ -72,6 +72,7 @@ static void __uses_jump_to_uncached sh4_flush_icache_range(void *args)

		for (v = start; v < end; v += L1_CACHE_BYTES) {
		unsigned long icacheaddr;
		int j, n;

		__ocbwb(v);

		@@ -79,8 +80,10 @@ static void __uses_jump_to_uncached sh4_flush_icache_range(void *args)
		cpu_data->icache.entry_mask);

		/* Clear i-cache line valid-bit */
		n = boot_cpu_data.icache.n_aliases;
		for (i = 0; i < cpu_data->icache.ways; i++) {
		__raw_writel(0, icacheaddr);
		for (j = 0; j < n; j++)
		__raw_writel(0, icacheaddr + (j * PAGE_SIZE));
		icacheaddr += cpu_data->icache.way_incr;
		}
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -1143,7 +1143,7 @@ static void serial_console_write(struct console co, const char s,
		while ((sci_in(port, SCxSR) & bits) != bits)
		cpu_relax();

		if (sci_port->disable);
		if (sci_port->disable)
		sci_port->disable(port);
		}