summaryrefslogtreecommitdiff
path: root/packages/reiserfsprogs/reiserfsprogs-3.6.19/header-fix.patch
diff options
context:
space:
mode:
authorMichael-Luke Jones <mlj28@cam.ac.uk>2006-12-17 15:14:57 +0000
committerMichael-Luke Jones <mlj28@cam.ac.uk>2006-12-17 15:14:57 +0000
commit965b9d9f46de481673f54745f447d9f8a73fc0a7 (patch)
treed237689ae8c647973992a7775f79a5c79de93d68 /packages/reiserfsprogs/reiserfsprogs-3.6.19/header-fix.patch
parentd2b3087e41fd3f2bd98a4d37f085a007942801e3 (diff)
reiserfsprogs: update to build with >=2.6.18 kernel headers
* steal a patch from fedora to remove requirement for asm/unaligned.h
Diffstat (limited to 'packages/reiserfsprogs/reiserfsprogs-3.6.19/header-fix.patch')
-rw-r--r--packages/reiserfsprogs/reiserfsprogs-3.6.19/header-fix.patch33
1 files changed, 33 insertions, 0 deletions
diff --git a/packages/reiserfsprogs/reiserfsprogs-3.6.19/header-fix.patch b/packages/reiserfsprogs/reiserfsprogs-3.6.19/header-fix.patch
new file mode 100644
index 0000000000..a117f2c19b
--- /dev/null
+++ b/packages/reiserfsprogs/reiserfsprogs-3.6.19/header-fix.patch
@@ -0,0 +1,33 @@
+--- reiserfsprogs-3.6.19/include/reiserfs_fs.h~ 2006-06-05 19:29:45.240611000 -0400
++++ reiserfsprogs-3.6.19/include/reiserfs_fs.h 2006-06-05 19:30:29.588212000 -0400
+@@ -38,15 +38,22 @@
+ # define extern_inline
+ #endif
+
+-#include <asm/unaligned.h>
++#define get_unaligned(ptr) \
++({ \
++ struct __attribute__((packed)) { \
++ typeof(*(ptr)) __v; \
++ } *__p = (void *)(ptr); \
++ __p->__v; \
++})
++
++#define put_unaligned(val, ptr) \
++do { \
++ struct __attribute__((packed)) { \
++ typeof(*(ptr)) __v; \
++ } *__p = (void *)(ptr); \
++ __p->__v = (val); \
++} while(0)
+
+-#ifndef get_unaligned
+-#if defined(__ppc__) || defined(ppc) || defined(__ppc) || \
+- defined(__PPC) || defined(powerpc) || defined(__powerpc__)
+-# define get_unaligned(ptr) (*(ptr))
+-# define put_unaligned(val,ptr) ((void)(*(ptr) = (val)))
+-#endif
+-#endif
+
+ #define get_leXX(xx,p,field) (le##xx##_to_cpu ((p)->field))
+ #define set_leXX(xx,p,field,val) do { (p)->field = cpu_to_le##xx(val); } while (0)