From 93079feae1048abe4ebe1ddc66197f31e1206101 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Wed, 26 Dec 2012 02:42:49 -0800
Subject: Wed Dec 26 02:41:56 PST 2012

---
 kernels/linux-libre-rt/PKGBUILD        |  3 ++-
 kernels/linux-libre-rt/fat-3.6.x.patch | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 kernels/linux-libre-rt/fat-3.6.x.patch

(limited to 'kernels')

diff --git a/kernels/linux-libre-rt/PKGBUILD b/kernels/linux-libre-rt/PKGBUILD
index a30ceece0..ed61b0c86 100644
--- a/kernels/linux-libre-rt/PKGBUILD
+++ b/kernels/linux-libre-rt/PKGBUILD
@@ -39,7 +39,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'fat-3.6.x.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
 md5sums=('a2312edd0265b5b07bd4b50afae2b380'
-         'bd4bba74093405887d521309a74c19e9'
+         'ced16b674906cf8c3733c012f804f5c7'
          '0be405891c7fb02b0026d4143f2207da'
          '11161582d9050710ccfecbe077fc5a63'
          'ac8f20b0cd83acb9525b5557e1fafeaf'
@@ -51,6 +51,7 @@ md5sums=('a2312edd0265b5b07bd4b50afae2b380'
          '670931649c60fcb3ef2e0119ed532bd4'
          '8a71abc4224f575008f974a099b5cf6f'
          '4909a0271af4e5f373136b382826717f'
+         '88d501404f172dac6fcb248978251560'
          'c188074cdc350ac7cf4e9c8d14c0575e')
 if [ "$CARCH" != "mips64el" ]; then
     # Don't use the Loongson-specific patches on non-mips64el arches.
diff --git a/kernels/linux-libre-rt/fat-3.6.x.patch b/kernels/linux-libre-rt/fat-3.6.x.patch
new file mode 100644
index 000000000..d8deeb788
--- /dev/null
+++ b/kernels/linux-libre-rt/fat-3.6.x.patch
@@ -0,0 +1,33 @@
+From: Dave Reisner <dreisner@archlinux.org>
+Date: Thu, 29 Nov 2012 03:18:52 +0000 (+1100)
+Subject: fs/fat: strip "cp" prefix from codepage in display
+X-Git-Tag: next-20121130~1^2~97
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fnext%2Flinux-next.git;a=commitdiff_plain;h=f15914873184cc3f2a8d590fa4f7e32ab0a8a405
+
+fs/fat: strip "cp" prefix from codepage in display
+
+Option parsing code expects an unsigned integer for the codepage option,
+but prefixes and stores this option with "cp" before passing to
+load_nls().  This makes the displayed option in /proc an invalid one.
+Strip the prefix when printing so that the displayed option is valid for
+reuse.
+
+Signed-off-by: Dave Reisner <dreisner@archlinux.org>
+Acked-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+---
+
+diff --git a/fs/fat/inode.c b/fs/fat/inode.c
+index 3b733a7..3580681 100644
+--- a/fs/fat/inode.c
++++ b/fs/fat/inode.c
+@@ -726,7 +726,8 @@ static int fat_show_options(struct seq_file *m, struct dentry *root)
+ 	if (opts->allow_utime)
+ 		seq_printf(m, ",allow_utime=%04o", opts->allow_utime);
+ 	if (sbi->nls_disk)
+-		seq_printf(m, ",codepage=%s", sbi->nls_disk->charset);
++		/* strip "cp" prefix from displayed option */
++		seq_printf(m, ",codepage=%s", &sbi->nls_disk->charset[2]);
+ 	if (isvfat) {
+ 		if (sbi->nls_io)
+ 			seq_printf(m, ",iocharset=%s", sbi->nls_io->charset);
-- 
cgit v1.2.3-54-g00ecf