mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-04-21 12:27:27 +03:00
[kernel] refresh patches against 2.6.27 final
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12987 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
--- a/fs/Kconfig
|
||||
+++ b/fs/Kconfig
|
||||
@@ -1348,6 +1348,71 @@
|
||||
@@ -1348,6 +1348,71 @@ config CRAMFS
|
||||
|
||||
If unsure, say N.
|
||||
|
||||
@@ -74,7 +74,7 @@
|
||||
depends on BLOCK
|
||||
--- a/fs/Makefile
|
||||
+++ b/fs/Makefile
|
||||
@@ -74,6 +74,7 @@
|
||||
@@ -74,6 +74,7 @@ obj-$(CONFIG_JBD) += jbd/
|
||||
obj-$(CONFIG_JBD2) += jbd2/
|
||||
obj-$(CONFIG_EXT2_FS) += ext2/
|
||||
obj-$(CONFIG_CRAMFS) += cramfs/
|
||||
@@ -4128,7 +4128,7 @@
|
||||
#include <linux/initrd.h>
|
||||
#include <linux/string.h>
|
||||
|
||||
@@ -37,6 +38,7 @@
|
||||
@@ -37,6 +38,7 @@ static int __init crd_load(int in_fd, in
|
||||
* numbers could not be found.
|
||||
*
|
||||
* We currently check for the following magic numbers:
|
||||
@@ -4136,7 +4136,7 @@
|
||||
* minix
|
||||
* ext2
|
||||
* romfs
|
||||
@@ -51,6 +53,7 @@
|
||||
@@ -51,6 +53,7 @@ identify_ramdisk_image(int fd, int start
|
||||
struct ext2_super_block *ext2sb;
|
||||
struct romfs_super_block *romfsb;
|
||||
struct cramfs_super *cramfsb;
|
||||
@@ -4144,7 +4144,7 @@
|
||||
int nblocks = -1;
|
||||
unsigned char *buf;
|
||||
|
||||
@@ -62,6 +65,7 @@
|
||||
@@ -62,6 +65,7 @@ identify_ramdisk_image(int fd, int start
|
||||
ext2sb = (struct ext2_super_block *) buf;
|
||||
romfsb = (struct romfs_super_block *) buf;
|
||||
cramfsb = (struct cramfs_super *) buf;
|
||||
@@ -4152,7 +4152,7 @@
|
||||
memset(buf, 0xe5, size);
|
||||
|
||||
/*
|
||||
@@ -99,6 +103,15 @@
|
||||
@@ -99,6 +103,15 @@ identify_ramdisk_image(int fd, int start
|
||||
goto done;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user