Commit 057a056c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull CRIS updates from Jesper Nilsson.

* tag 'cris-for-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris:
  cris: return of class_create should be considered
  CRIS: defconfig: remove MTDRAM_ABS_POS
  CRIS v32: remove some double unlocks
  Fix typos
  cris: migrate exception table users off module.h and onto extable.h
  cris: v10: axisflashmap: remove unused ifdefs
  cris: use generic io.h
  cris: fix Kconfig mismatch when building with CONFIG_PCI
  cris: cardbus: fix header include path
  cris: add dev88_defconfig
  cris: irq: stop loop from accessing array out of bounds
  cris: fasttimer: fix mixed declarations and code compile warning
  cris: intmem: fix pointer comparison compile warning
  cris: intmem: fix device_initcall compile warning
parents 93c26d7d 2dc024e9

arch/cris/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ config GENERIC_CALIBRATE_DELAY 
	default y



config NO_IOPORT_MAP

	def_bool y

	def_bool y if !PCI



config FORCE_MAX_ZONEORDER

	int

arch/cris/arch-v10/drivers/axisflashmap.c

+0 −19
Original line number Diff line number Diff line
@@ -177,15 +177,6 @@ static struct mtd_partition axis_partitions[MAX_PARTITIONS] = { 
	},

};



#ifdef CONFIG_ETRAX_AXISFLASHMAP_MTD0WHOLE

/* Main flash device */

static struct mtd_partition main_partition = {

	.name = "main",

	.size = 0,

	.offset = 0

};

#endif



/*

 * Probe a chip select for AMD-compatible (JEDEC) or CFI-compatible flash

 * chips in that order (because the amd_flash-driver is faster).
@@ -369,16 +360,6 @@ static int __init init_axis_flash(void) 
		pidx++;

	}



#ifdef CONFIG_ETRAX_AXISFLASHMAP_MTD0WHOLE

	if (mymtd) {

		main_partition.size = mymtd->size;

		err = mtd_device_register(mymtd, &main_partition, 1);

		if (err)

			panic("axisflashmap: Could not initialize "

			      "partition for whole main mtd device!\n");

	}

#endif



        if (mymtd) {

		if (use_default_ptable) {

			printk(KERN_INFO " Using default partition table.\n");

arch/cris/arch-v10/drivers/eeprom.c

+1 −1
Original line number Diff line number Diff line
@@ -395,7 +395,7 @@ static int eeprom_open(struct inode * inode, struct file * file) 
static loff_t eeprom_lseek(struct file * file, loff_t offset, int orig)

{

/*

 *  orig 0: position from begning of eeprom

 *  orig 0: position from beginning of eeprom

 *  orig 1: relative from current position

 *  orig 2: position from last eeprom address

 */

arch/cris/arch-v10/lib/dram_init.S

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
 * This file is intended to be included from other assembler files

 *

 * Note: This file may not modify r9 because r9 is used to carry

 *       information from the decompresser to the kernel

 *       information from the decompressor to the kernel

 *

 * Copyright (C) 2000-2012 Axis Communications AB

 *

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

+1 −1
Original line number Diff line number Diff line
@@ -1210,7 +1210,7 @@ static int cryptocop_setup_dma_list(struct cryptocop_operation *operation, struc 
		assert(active_count >= eop_needed_count);

		assert((eop_needed_count == 0) || (eop_needed_count == 1));

		if (eop_needed_count) {

			/* This means that the bulk operation (cipeher/m2m) is terminated. */

			/* This means that the bulk operation (cipher/m2m) is terminated. */

			if (active_count > 1) {

				/* Use zero length EOP descriptor. */

				struct cryptocop_dma_desc *ed = alloc_cdesc(alloc_flag);

CRA Git | Maintained and supported by SUSTech CRA and CCSE