Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d4fcae1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 

* 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
  sh: Fix build alloc_thread_info_node function
  sh: Fix ptrace hw_breakpoint handling
  sh: Fix ptrace fpu state initialisation
  sh: Re-enable GENERIC_HARDIRQS_NO_DEPRECATED.
  sh: pmb: Use struct syscore_ops instead of sysdevs
  sh: Use struct syscore_ops instead of sysdevs
  sh: Conver to asm-generic/sizes.h.
  sh: wire up sys_syncfs.
parents b4a41ed2 b15ed691

arch/sh/Kconfig

+1 −2
Original line number Original line Diff line number Diff line
@@ -23,8 +23,7 @@ config SUPERH 
	select HAVE_SPARSE_IRQ

	select HAVE_SPARSE_IRQ

	select RTC_LIB

	select RTC_LIB

	select GENERIC_ATOMIC64

	select GENERIC_ATOMIC64

	# Support the deprecated APIs until MFD and GPIOLIB catch up.

	select GENERIC_HARDIRQS_NO_DEPRECATED

	select GENERIC_HARDIRQS_NO_DEPRECATED if !MFD_SUPPORT && !GPIOLIB

	select GENERIC_IRQ_SHOW

	select GENERIC_IRQ_SHOW

	help

	help

	  The SuperH is a RISC processor targeted for use in embedded systems

	  The SuperH is a RISC processor targeted for use in embedded systems

arch/sh/boards/board-edosk7760.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -56,7 +56,7 @@ static struct mtd_partition edosk7760_nor_flash_partitions[] = { 
	}, {

	}, {

		.name = "fs",

		.name = "fs",

		.offset = MTDPART_OFS_APPEND,

		.offset = MTDPART_OFS_APPEND,

		.size = SZ_26M,

		.size = (26 << 20),

	}, {

	}, {

		.name = "other",

		.name = "other",

		.offset = MTDPART_OFS_APPEND,

		.offset = MTDPART_OFS_APPEND,

arch/sh/include/asm/sizes.h

+1 −62
Original line number Original line Diff line number Diff line 
/*

#include <asm-generic/sizes.h>
 
 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

 */

/* DO NOT EDIT!! - this file automatically generated

 *                 from .s file by awk -f s2h.awk

 */

/*  Size definitions

 *  Copyright (C) ARM Limited 1998. All rights reserved.

 */



#ifndef __sizes_h

#define __sizes_h                       1



/* handy sizes */

#define SZ_16				0x00000010

#define SZ_32				0x00000020

#define SZ_64				0x00000040

#define SZ_128				0x00000080

#define SZ_256				0x00000100

#define SZ_512				0x00000200



#define SZ_1K                           0x00000400

#define SZ_2K                           0x00000800

#define SZ_4K                           0x00001000

#define SZ_8K                           0x00002000

#define SZ_16K                          0x00004000

#define SZ_32K				0x00008000

#define SZ_64K                          0x00010000

#define SZ_128K                         0x00020000

#define SZ_256K                         0x00040000

#define SZ_512K                         0x00080000



#define SZ_1M                           0x00100000

#define SZ_2M                           0x00200000

#define SZ_4M                           0x00400000

#define SZ_8M                           0x00800000

#define SZ_16M                          0x01000000

#define SZ_26M				0x01a00000

#define SZ_32M                          0x02000000

#define SZ_64M                          0x04000000

#define SZ_128M                         0x08000000

#define SZ_256M                         0x10000000

#define SZ_512M                         0x20000000



#define SZ_1G                           0x40000000

#define SZ_2G                           0x80000000



#endif



/*         END */

arch/sh/include/asm/unistd_32.h

+2 −1
Original line number Original line Diff line number Diff line
@@ -372,8 +372,9 @@ 
#define __NR_name_to_handle_at	359

#define __NR_name_to_handle_at	359

#define __NR_open_by_handle_at	360

#define __NR_open_by_handle_at	360

#define __NR_clock_adjtime	361

#define __NR_clock_adjtime	361

#define __NR_syncfs		362





#define NR_syscalls 362

#define NR_syscalls 363





#ifdef __KERNEL__

#ifdef __KERNEL__

arch/sh/include/asm/unistd_64.h

+2 −1
Original line number Original line Diff line number Diff line
@@ -393,10 +393,11 @@ 
#define __NR_name_to_handle_at	370

#define __NR_name_to_handle_at	370

#define __NR_open_by_handle_at	371

#define __NR_open_by_handle_at	371

#define __NR_clock_adjtime	372

#define __NR_clock_adjtime	372

#define __NR_syncfs		373





#ifdef __KERNEL__

#ifdef __KERNEL__





#define NR_syscalls 373

#define NR_syscalls 374





#define __ARCH_WANT_IPC_PARSE_VERSION

#define __ARCH_WANT_IPC_PARSE_VERSION

#define __ARCH_WANT_OLD_READDIR

#define __ARCH_WANT_OLD_READDIR