The following commit has been merged in the master branch: commit f5d142f561cca02f8dc814075bc03393bd5d233d Author: Patrick Winnertz <win...@debian.org> Date: Fri Dec 17 13:16:14 2010 +0100
Remove mark_rodata_ro and mark_rodata_rw from cacheflush.h as it is redefined in main.c Signed-off-by: Patrick Winnertz <win...@debian.org> diff --git a/debian/patches/cacheflush_remove_mark_rodata.patch b/debian/patches/cacheflush_remove_mark_rodata.patch new file mode 100644 index 0000000..0b5a509 --- /dev/null +++ b/debian/patches/cacheflush_remove_mark_rodata.patch @@ -0,0 +1,37 @@ +diff --git a/lustre/kernel_patches/patches/cacheflush_remove_mark_rodata.patch b/lustre/kernel_patches/patches/cacheflush_remove_mark_rodata.patch +new file mode 100644 +index 0000000..a73080d +--- /dev/null ++++ b/lustre/kernel_patches/patches/cacheflush_remove_mark_rodata.patch +@@ -0,0 +1,12 @@ ++diff -Nurwd linux-2.6.32.19-0.2.orig/arch/x86/include/asm/cacheflush.h linux-2.6.32.19-0.2/arch/x86/include/asm/cacheflush.h ++--- linux-2.6.32.19-0.2.orig/arch/x86/include/asm/cacheflush.h 2010-12-17 13:06:00.980980003 +0100 +++++ linux-2.6.32.19-0.2/arch/x86/include/asm/cacheflush.h 2010-12-17 13:11:31.488980002 +0100 ++@@ -189,8 +189,6 @@ ++ void set_kernel_text_rw(void); ++ void set_kernel_text_ro(void); ++ #else ++-static inline void mark_rodata_ro(void) { } ++-static inline void mark_rodata_rw(void) { } ++ static inline void set_kernel_text_rw(void) { } ++ static inline void set_kernel_text_ro(void) { } ++ #endif +diff --git a/lustre/kernel_patches/series/2.6-sles11-2.6.32.series b/lustre/kernel_patches/series/2.6-sles11-2.6.32.series +new file mode 100644 +index 0000000..3478c30 +--- /dev/null ++++ b/lustre/kernel_patches/series/2.6-sles11-2.6.32.series +@@ -0,0 +1,13 @@ ++lustre_version.patch ++vfs_races-2.6.22-vanilla.patch ++iopen-misc-2.6.22-vanilla.patch ++export-truncate-2.6.18-vanilla.patch ++dev_read_only-2.6.27-vanilla.patch ++export-2.6.27-vanilla.patch ++export-show_task-2.6.27-vanilla.patch ++sd_iostats-2.6.32-vanilla.patch ++md-mmp-unplug-dev-sles11.patch ++quota-support-64-bit-quota-format.patch ++jbd2-jcberr-2.6-sles11.patch ++jbd2_stats_proc_init-wrong-place.patch ++cacheflush_remove_mark_rodata.patch diff --git a/debian/patches/series b/debian/patches/series index 9fc9cb8..2f87c1b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -22,3 +22,4 @@ no-strict-aliasing.patch fix_bashisms_for_dash.patch fix_dentry_conf_test.patch spelling_errors.patch +cacheflush_remove_mark_rodata.patch -- Lustre Debian Packaging _______________________________________________ Pkg-lustre-svn-commit mailing list Pkg-lustre-svn-commit@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-lustre-svn-commit