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

Commit 3720bd8b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/tglx/mtd-2.6

parents a61caa85 6a8b4d31

drivers/mtd/chips/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -300,7 +300,7 @@ config MTD_JEDEC 


config MTD_XIP

	bool "XIP aware MTD support"

	depends on !SMP && (MTD_CFI_INTELEXT || MTD_CFI_AMDSTD) && EXPERIMENTAL

	depends on !SMP && (MTD_CFI_INTELEXT || MTD_CFI_AMDSTD) && EXPERIMENTAL && ARM

	default y if XIP_KERNEL

	help

	  This allows MTD support to work with flash memory which is also

drivers/mtd/chips/cfi_cmdset_0020.c

+4 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
 *

 * (C) 2000 Red Hat. GPL'd

 *

 * $Id: cfi_cmdset_0020.c,v 1.17 2004/11/20 12:49:04 dwmw2 Exp $

 * $Id: cfi_cmdset_0020.c,v 1.19 2005/07/13 15:52:45 dwmw2 Exp $

 * 

 * 10/10/2000	Nicolas Pitre <nico@cam.org>

 * 	- completely revamped method functions so they are aware and
@@ -16,6 +16,8 @@ 
 *	- modified Intel Command Set 0x0001 to support ST Advanced Architecture

 *	  (command set 0x0020)

 *	- added a writev function

 * 07/13/2005	Joern Engel <joern@wh.fh-wedel.de>

 * 	- Plugged memory leak in cfi_staa_writev().

 */



#include <linux/version.h>
@@ -719,6 +721,7 @@ cfi_staa_writev(struct mtd_info *mtd, const struct kvec *vecs, 
write_error:

	if (retlen)

		*retlen = totlen;

	kfree(buffer);

	return ret;

}

fs/jffs2/build.c

+1 −8
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
 *

 * For licensing information, see the file 'LICENCE' in this directory.

 *

 * $Id: build.c,v 1.70 2005/02/28 08:21:05 dedekind Exp $

 * $Id: build.c,v 1.71 2005/07/12 16:37:08 dedekind Exp $

 *

 */
@@ -336,13 +336,6 @@ int jffs2_do_mount_fs(struct jffs2_sb_info *c) 
		c->blocks[i].bad_count = 0;

	}



	init_MUTEX(&c->alloc_sem);

	init_MUTEX(&c->erase_free_sem);

	init_waitqueue_head(&c->erase_wait);

	init_waitqueue_head(&c->inocache_wq);

	spin_lock_init(&c->erase_completion_lock);

	spin_lock_init(&c->inocache_lock);



	INIT_LIST_HEAD(&c->clean_list);

	INIT_LIST_HEAD(&c->very_dirty_list);

	INIT_LIST_HEAD(&c->dirty_list);

fs/jffs2/nodelist.c

+7 −7
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
 *

 * For licensing information, see the file 'LICENCE' in this directory.

 *

 * $Id: nodelist.c,v 1.97 2005/07/06 15:18:41 dwmw2 Exp $

 * $Id: nodelist.c,v 1.98 2005/07/10 15:15:32 dedekind Exp $

 *

 */
@@ -55,11 +55,11 @@ void jffs2_add_fd_to_list(struct jffs2_sb_info *c, struct jffs2_full_dirent *new 
	});

}



/* Put a new tmp_dnode_info into the list, keeping the list in 

   order of increasing version

/* 

 * Put a new tmp_dnode_info into the temporaty RB-tree, keeping the list in 

 * order of increasing version.

 */



static void jffs2_add_tn_to_list(struct jffs2_tmp_dnode_info *tn, struct rb_root *list)

static void jffs2_add_tn_to_tree(struct jffs2_tmp_dnode_info *tn, struct rb_root *list)

{

	struct rb_node **p = &list->rb_node;

	struct rb_node * parent = NULL;
@@ -420,7 +420,7 @@ int jffs2_get_inode_nodes(struct jffs2_sb_info *c, struct jffs2_inode_info *f, 
			D1(printk(KERN_DEBUG "dnode @%08x: ver %u, offset %04x, dsize %04x\n",

				  ref_offset(ref), je32_to_cpu(node.i.version),

				  je32_to_cpu(node.i.offset), je32_to_cpu(node.i.dsize)));

			jffs2_add_tn_to_list(tn, &ret_tn);

			jffs2_add_tn_to_tree(tn, &ret_tn);

			break;



		default:

fs/jffs2/os-linux.h

+3 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
 *

 * For licensing information, see the file 'LICENCE' in this directory.

 *

 * $Id: os-linux.h,v 1.57 2005/07/06 12:13:09 dwmw2 Exp $

 * $Id: os-linux.h,v 1.58 2005/07/12 02:34:35 tpoynor Exp $

 *

 */
@@ -86,6 +86,8 @@ static inline void jffs2_init_inode_info(struct jffs2_inode_info *f) 
#define jffs2_dataflash(c) (0)

#define jffs2_nor_ecc_flash_setup(c) (0)

#define jffs2_nor_ecc_flash_cleanup(c) do {} while (0)

#define jffs2_dataflash_setup(c) (0)

#define jffs2_dataflash_cleanup(c) do {} while (0)



#else /* NAND and/or ECC'd NOR support present */