Commit db07b023 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
  sh: Fix up restorer in debug_trap exception return path.
  sh: Make is_valid_bugaddr() more intelligent on nommu.
  sh: use the common ascii hex helpers
  sh: fix sh7785 master clock value
  sh: Fix up thread info pointer in syscall_badsys resume path.
  sh: Fix up optimized SH-4 memcpy on big endian.
  sh: disable initrd defaults in .empty_zero_page.
  sh: display boot params by default on entry.
parents 88e6c949 336f1d32

arch/sh/kernel/cpu/sh4a/clock-sh7785.c

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ static int pfc_divisors[] = { 1, 1, 1, 1, 1, 1, 1, 18, 


static void master_clk_init(struct clk *clk)

{

	clk->rate *= 36;

	clk->rate *= pfc_divisors[ctrl_inl(FRQMR1) & 0x000f];

}



static struct clk_ops sh7785_master_clk_ops = {

arch/sh/kernel/entry-common.S

+6 −6
Original line number Diff line number Diff line 
/* $Id: entry.S,v 1.37 2004/06/11 13:02:46 doyu Exp $

 *

 *  linux/arch/sh/entry.S

 *

/* 

 *  Copyright (C) 1999, 2000, 2002  Niibe Yutaka

 *  Copyright (C) 2003  Paul Mundt

 *  Copyright (C) 2003 - 2008  Paul Mundt

 *

 * This file is subject to the terms and conditions of the GNU General Public

 * License.  See the file "COPYING" in the main directory of this archive
@@ -262,6 +259,7 @@ __restore_all: 


	.align	2

syscall_badsys:			! Bad syscall number

	get_current_thread_info r8, r0

	mov	#-ENOSYS, r0

	bra	resume_userspace

	 mov.l	r0, @(OFF_R0,r15)	! Return value
@@ -281,7 +279,9 @@ debug_trap: 
	mov.l	1f, r8

	add	r0, r8

	mov.l	@r8, r8

	jmp	@r8

	jsr	@r8

	 nop

	bra	__restore_all

	 nop



	.align	2

arch/sh/kernel/head_32.S

+2 −2
Original line number Diff line number Diff line
@@ -30,8 +30,8 @@ ENTRY(empty_zero_page) 
	.long	0		/* RAMDISK_FLAGS */

	.long	0x0200		/* ORIG_ROOT_DEV */

	.long	1		/* LOADER_TYPE */

	.long	0x00360000	/* INITRD_START */

	.long	0x000a0000	/* INITRD_SIZE */

	.long	0x00000000	/* INITRD_START */

	.long	0x00000000	/* INITRD_SIZE */

#ifdef CONFIG_32BIT

	.long	0x53453f00 + 32	/* "SE?" = 32 bit */

#else

arch/sh/kernel/kgdb_stub.c

+5 −6
Original line number Diff line number Diff line
@@ -274,8 +274,7 @@ static char *mem_to_hex(const char *mem, char *buf, const int count) 
	}

	for (i = 0; i < count; i++) {

		ch = *mem++;

		*buf++ = highhex(ch);

		*buf++ = lowhex(ch);

		buf = pack_hex_byte(buf, ch);

	}

	*buf = 0;

	return (buf);
@@ -427,8 +426,8 @@ static void put_packet(char *buffer) 


		/* '#' Separator, put high and low components of checksum */

		put_debug_char('#');

		put_debug_char(highhex(checksum));

		put_debug_char(lowhex(checksum));

		put_debug_char(hex_asc_hi(checksum));

		put_debug_char(hex_asc_lo(checksum));

	}

	while ((get_debug_char()) != '+');	/* While no ack */

}
@@ -650,8 +649,8 @@ static void undo_single_step(void) 
static void send_signal_msg(const int signum)

{

	out_buffer[0] = 'S';

	out_buffer[1] = highhex(signum);

	out_buffer[2] = lowhex(signum);

	out_buffer[1] = hex_asc_hi(signum);

	out_buffer[2] = hex_asc_lo(signum);

	out_buffer[3] = 0;

	put_packet(out_buffer);

}

arch/sh/kernel/setup.c

+11 −0
Original line number Diff line number Diff line
@@ -292,6 +292,17 @@ void __init setup_arch(char **cmdline_p) 


	ROOT_DEV = old_decode_dev(ORIG_ROOT_DEV);



	printk(KERN_NOTICE "Boot params:\n"

			   "... MOUNT_ROOT_RDONLY - %08lx\n"

			   "... RAMDISK_FLAGS     - %08lx\n"

			   "... ORIG_ROOT_DEV     - %08lx\n"

			   "... LOADER_TYPE       - %08lx\n"

			   "... INITRD_START      - %08lx\n"

			   "... INITRD_SIZE       - %08lx\n",

			   MOUNT_ROOT_RDONLY, RAMDISK_FLAGS,

			   ORIG_ROOT_DEV, LOADER_TYPE,

			   INITRD_START, INITRD_SIZE);



#ifdef CONFIG_BLK_DEV_RAM

	rd_image_start = RAMDISK_FLAGS & RAMDISK_IMAGE_START_MASK;

	rd_prompt = ((RAMDISK_FLAGS & RAMDISK_PROMPT_FLAG) != 0);

CRA Git | Maintained and supported by SUSTech CRA and CCSE