OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5b2f7ff
c2965f1
)
Merge master.kernel.org:/pub/scm/linux/kernel/git/tglx/mtd-2.6
author
Linus Torvalds
<torvalds@g5.osdl.org>
Mon, 7 Nov 2005 18:24:08 +0000
(10:24 -0800)
committer
Linus Torvalds
<torvalds@g5.osdl.org>
Mon, 7 Nov 2005 18:24:08 +0000
(10:24 -0800)
Some manual fixups for clashing kfree() cleanups etc.
22 files changed:
1
2
drivers/mtd/chips/cfi_cmdset_0001.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/mtd/chips/cfi_cmdset_0002.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/mtd/devices/blkmtd.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/mtd/inftlcore.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/mtd/inftlmount.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/mtd/maps/amd76xrom.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/mtd/maps/bast-flash.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/mtd/maps/ichxrom.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/mtd/maps/integrator-flash.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/mtd/maps/ipaq-flash.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/mtd/maps/iq80310.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/mtd/maps/ixp2000.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/mtd/maps/ixp4xx.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/mtd/maps/lubbock-flash.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/mtd/maps/omap-toto-flash.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/mtd/maps/sa1100-flash.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/mtd/maps/sun_uflash.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/mtd/maps/tqm8xxl.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/mtd/nand/nand_base.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/mtd/nftlcore.c
patch
|
diff1
|
diff2
|
blob
|
history
fs/Kconfig
patch
|
diff1
|
diff2
|
blob
|
history
fs/jffs2/wbuf.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
drivers/mtd/chips/cfi_cmdset_0001.c
Simple merge
diff --cc
drivers/mtd/chips/cfi_cmdset_0002.c
Simple merge
diff --cc
drivers/mtd/devices/blkmtd.c
Simple merge
diff --cc
drivers/mtd/inftlcore.c
Simple merge
diff --cc
drivers/mtd/inftlmount.c
Simple merge
diff --cc
drivers/mtd/maps/amd76xrom.c
Simple merge
diff --cc
drivers/mtd/maps/bast-flash.c
Simple merge
diff --cc
drivers/mtd/maps/ichxrom.c
Simple merge
diff --cc
drivers/mtd/maps/integrator-flash.c
Simple merge
diff --cc
drivers/mtd/maps/ipaq-flash.c
Simple merge
diff --cc
drivers/mtd/maps/iq80310.c
Simple merge
diff --cc
drivers/mtd/maps/ixp2000.c
Simple merge
diff --cc
drivers/mtd/maps/ixp4xx.c
index
0d87c02
,
471553a
..
56b3a35
---
1
/
drivers/mtd/maps/ixp4xx.c
---
2
/
drivers/mtd/maps/ixp4xx.c
+++ b/
drivers/mtd/maps/ixp4xx.c
@@@
-121,10
-114,11
+114,10
@@@
static int ixp4xx_flash_remove(struct d
del_mtd_partitions(info->mtd);
map_destroy(info->mtd);
}
- if (info->map.
map_priv_1
)
- iounmap(
(void *) info->map.map_priv_1
);
+ if (info->map.
virt
)
+ iounmap(
info->map.virt
);
- if (info->partitions)
- kfree(info->partitions);
+ kfree(info->partitions);
if (info->res) {
release_resource(info->res);
diff --cc
drivers/mtd/maps/lubbock-flash.c
Simple merge
diff --cc
drivers/mtd/maps/omap-toto-flash.c
Simple merge
diff --cc
drivers/mtd/maps/sa1100-flash.c
Simple merge
diff --cc
drivers/mtd/maps/sun_uflash.c
index
1355c28
,
47941fb
..
0758cb1
---
1
/
drivers/mtd/maps/sun_uflash.c
---
2
/
drivers/mtd/maps/sun_uflash.c
+++ b/
drivers/mtd/maps/sun_uflash.c
@@@
-166,9
-166,11
+166,9
@@@
static void __exit uflash_cleanup(void
iounmap(udev->map.virt);
udev->map.virt = NULL;
}
- if(0 != udev->name) {
- kfree(udev->name);
- }
+ kfree(udev->name);
kfree(udev);
- }
+ }
}
module_init(uflash_init);
diff --cc
drivers/mtd/maps/tqm8xxl.c
Simple merge
diff --cc
drivers/mtd/nand/nand_base.c
Simple merge
diff --cc
drivers/mtd/nftlcore.c
Simple merge
diff --cc
fs/Kconfig
Simple merge
diff --cc
fs/jffs2/wbuf.c
Simple merge