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

Commit 971d9e07 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'cris-changes-for-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris 

Pull arch/chris updates from Jesper Nilsson:
 "Mostly cleanup and build fixes for CRISv32 allmodconfig

  God Jul och Gott Nytt år!"

* tag 'cris-changes-for-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris:
  CRISv32: Remove last remnants of ETRAX_SPI_MMC_BOARD
  CRISv32: ETRAXFS: Fix recursive spinlock
  CRISv32: Select MTDRAM for axisflashmap
  CRISv32: Implement early console
  CRIS: Use KALLSYMs if available in call stack dump
  CRISv32: Fix declaration mismatch
  CRISv32: Rewrite of synchronous serial port driver
  CRIS: Update init memory handling
  CRISv32: Better handling of watchdog bite
  CRIS: Export missing function symbols
  CRIS: Export ioremap_nocache
  CRIS: Fix headers_install
  CRISv32: Add missing include for mm.h
  CRISv32: Drop obsolete file for SPI driver
parents acab1f88 8bcabff0

arch/cris/arch-v10/lib/usercopy.c

+7 −7
Original line number Diff line number Diff line
@@ -30,8 +30,7 @@ 
/* Copy to userspace.  This is based on the memcpy used for

   kernel-to-kernel copying; see "string.c".  */



unsigned long

__copy_user (void __user *pdst, const void *psrc, unsigned long pn)

unsigned long __copy_user(void __user *pdst, const void *psrc, unsigned long pn)

{

  /* We want the parameters put in special registers.

     Make sure the compiler is able to make something useful of this.
@@ -187,13 +186,14 @@ __copy_user (void __user *pdst, const void *psrc, unsigned long pn) 


  return retn;

}

EXPORT_SYMBOL(__copy_user);



/* Copy from user to kernel, zeroing the bytes that were inaccessible in

   userland.  The return-value is the number of bytes that were

   inaccessible.  */



unsigned long

__copy_user_zeroing(void *pdst, const void __user *psrc, unsigned long pn)

unsigned long __copy_user_zeroing(void *pdst, const void __user *psrc,

				  unsigned long pn)

{

  /* We want the parameters put in special registers.

     Make sure the compiler is able to make something useful of this.
@@ -369,11 +369,10 @@ __copy_user_zeroing(void *pdst, const void __user *psrc, unsigned long pn) 


  return retn + n;

}

EXPORT_SYMBOL(__copy_user_zeroing);



/* Zero userspace.  */



unsigned long

__do_clear_user (void __user *pto, unsigned long pn)

unsigned long __do_clear_user(void __user *pto, unsigned long pn)

{

  /* We want the parameters put in special registers.

     Make sure the compiler is able to make something useful of this.
@@ -521,3 +520,4 @@ __do_clear_user (void __user *pto, unsigned long pn) 


  return retn;

}

EXPORT_SYMBOL(__do_clear_user);

arch/cris/arch-v32/drivers/Kconfig

+1 −7
Original line number Diff line number Diff line
@@ -108,6 +108,7 @@ config ETRAX_AXISFLASHMAP 
	select MTD_JEDECPROBE

	select MTD_BLOCK

	select MTD_COMPLEX_MAPPINGS

	select MTD_MTDRAM

	help

	  This option enables MTD mapping of flash devices.  Needed to use

	  flash memories.  If unsure, say Y.
@@ -358,13 +359,6 @@ config ETRAX_SPI_MMC 
	default MMC

	select SPI

	select MMC_SPI

	select ETRAX_SPI_MMC_BOARD



# For the parts that can't be a module (due to restrictions in

# framework elsewhere).

config ETRAX_SPI_MMC_BOARD

       boolean

       default n



# While the board info is MMC_SPI only, the drivers are written to be

# independent of MMC_SPI, so we'll keep SPI non-dependent on the

arch/cris/arch-v32/drivers/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -10,4 +10,3 @@ obj-$(CONFIG_ETRAX_IOP_FW_LOAD) += iop_fw_load.o 
obj-$(CONFIG_ETRAX_I2C)			+= i2c.o

obj-$(CONFIG_ETRAX_SYNCHRONOUS_SERIAL)	+= sync_serial.o

obj-$(CONFIG_PCI)			+= pci/
 
obj-$(CONFIG_ETRAX_SPI_MMC_BOARD)	+= board_mmcspi.o

arch/cris/arch-v32/drivers/i2c.h

+0 −1
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
#include <linux/init.h>



/* High level I2C actions */

int __init i2c_init(void);

int i2c_write(unsigned char theSlave, void *data, size_t nbytes);

int i2c_read(unsigned char theSlave, void *data, size_t nbytes);

int i2c_writereg(unsigned char theSlave, unsigned char theReg, unsigned char theValue);

arch/cris/arch-v32/drivers/sync_serial.c

+791 −639

File changed.

Preview size limit exceeded, changes collapsed.