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

Commit 0e97456a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k 

Pull m68k updates from Geert Uytterhoeven.

* 'for-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k/q40: Enable PC parallel port in defconfig
  m68k/q40: Undefine insl/outsl before redefining them
  m68k/uaccess: Fix asm constraints for userspace access
  swim: Release memory region after incorrect return/goto
  m68k/irq: Vector ints need a valid interrupt handler
  m68k/math-emu: unsigned issue, 'unsigned long' will never be less than zero
  m68k: remove CONFIG_EARLY_PRINTK dependency on CONFIG_EMBEDDED, default to n
  m68k/sun3: remove inline marking of EXPORT_SYMBOL functions
  [SCSI] a3000: use module_platform_driver_probe()
  [SCSI] a4000t: use module_platform_driver_probe()
  m68k: Remove inline strcpy() and strcat() implementations
parents 76d3f4c2 980f3a73

arch/m68k/Kconfig.debug

+1 −2
Original line number Diff line number Diff line
@@ -11,9 +11,8 @@ config BOOTPARAM_STRING 
	depends on BOOTPARAM



config EARLY_PRINTK

	bool "Early printk" if EMBEDDED

	bool "Early printk"

	depends on MVME16x || MAC

	default y

	help

          Write kernel log output directly to a serial port.

arch/m68k/configs/multi_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -214,6 +214,7 @@ CONFIG_DEVTMPFS=y 
# CONFIG_FW_LOADER_USER_HELPER is not set

CONFIG_CONNECTOR=m

CONFIG_PARPORT=m

CONFIG_PARPORT_PC=m

CONFIG_PARPORT_AMIGA=m

CONFIG_PARPORT_MFC3=m

CONFIG_PARPORT_ATARI=m
@@ -325,6 +326,7 @@ CONFIG_ZORRO8390=y 
# CONFIG_NET_VENDOR_SEEQ is not set

# CONFIG_NET_VENDOR_STMICRO is not set

# CONFIG_NET_VENDOR_WIZNET is not set

CONFIG_PLIP=m

CONFIG_PPP=m

CONFIG_PPP_BSDCOMP=m

CONFIG_PPP_DEFLATE=m

arch/m68k/configs/q40_defconfig

+6 −0
Original line number Diff line number Diff line
@@ -199,6 +199,9 @@ CONFIG_DEVTMPFS=y 
# CONFIG_FIRMWARE_IN_KERNEL is not set

# CONFIG_FW_LOADER_USER_HELPER is not set

CONFIG_CONNECTOR=m

CONFIG_PARPORT=m

CONFIG_PARPORT_PC=m

CONFIG_PARPORT_1284=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_CRYPTOLOOP=m

CONFIG_BLK_DEV_DRBD=m
@@ -267,6 +270,7 @@ CONFIG_NE2000=m 
# CONFIG_NET_VENDOR_SMSC is not set

# CONFIG_NET_VENDOR_STMICRO is not set

# CONFIG_NET_VENDOR_WIZNET is not set

CONFIG_PLIP=m

CONFIG_PPP=m

CONFIG_PPP_BSDCOMP=m

CONFIG_PPP_DEFLATE=m
@@ -292,9 +296,11 @@ CONFIG_SERIO_Q40KBD=y 
CONFIG_VT_HW_CONSOLE_BINDING=y

# CONFIG_LEGACY_PTYS is not set

# CONFIG_DEVKMEM is not set

CONFIG_PRINTER=m

# CONFIG_HW_RANDOM is not set

CONFIG_NTP_PPS=y

CONFIG_PPS_CLIENT_LDISC=m

CONFIG_PPS_CLIENT_PARPORT=m

CONFIG_PTP_1588_CLOCK=m

# CONFIG_HWMON is not set

CONFIG_FB=y

arch/m68k/include/asm/parport.h

+2 −0
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ 
#ifndef _ASM_M68K_PARPORT_H

#define _ASM_M68K_PARPORT_H 1



#undef insl

#undef outsl

#define insl(port,buf,len)   isa_insb(port,buf,(len)<<2)

#define outsl(port,buf,len)  isa_outsb(port,buf,(len)<<2)

arch/m68k/include/asm/string.h

+0 −32
Original line number Diff line number Diff line
@@ -4,20 +4,6 @@ 
#include <linux/types.h>

#include <linux/compiler.h>



static inline char *__kernel_strcpy(char *dest, const char *src)

{

	char *xdest = dest;



	asm volatile ("\n"

		"1:	move.b	(%1)+,(%0)+\n"

		"	jne	1b"

		: "+a" (dest), "+a" (src)

		: : "memory");

	return xdest;

}



#ifndef __IN_STRING_C



#define __HAVE_ARCH_STRNLEN

static inline size_t strnlen(const char *s, size_t count)

{
@@ -34,16 +20,6 @@ static inline size_t strnlen(const char *s, size_t count) 
	return sc - s;

}



#define __HAVE_ARCH_STRCPY

#if __GNUC__ >= 4

#define strcpy(d, s)	(__builtin_constant_p(s) &&	\

			 __builtin_strlen(s) <= 32 ?	\

			 __builtin_strcpy(d, s) :	\

			 __kernel_strcpy(d, s))

#else

#define strcpy(d, s)	__kernel_strcpy(d, s)

#endif



#define __HAVE_ARCH_STRNCPY

static inline char *strncpy(char *dest, const char *src, size_t n)

{
@@ -61,12 +37,6 @@ static inline char *strncpy(char *dest, const char *src, size_t n) 
	return xdest;

}



#define __HAVE_ARCH_STRCAT

#define strcat(d, s)	({			\

	char *__d = (d);			\

	strcpy(__d + strlen(__d), (s));		\

})



#ifndef CONFIG_COLDFIRE

#define __HAVE_ARCH_STRCMP

static inline int strcmp(const char *cs, const char *ct)
@@ -100,6 +70,4 @@ extern void *memset(void *, int, __kernel_size_t); 
extern void *memcpy(void *, const void *, __kernel_size_t);

#define memcpy(d, s, n) __builtin_memcpy(d, s, n)



#endif



#endif /* _M68K_STRING_H_ */