git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'release' and 'ppc-workaround' into release
[safe/jmp/linux-2.6]
/
include
/
asm-sparc64
/
scatterlist.h
diff --git
a/include/asm-sparc64/scatterlist.h
b/include/asm-sparc64/scatterlist.h
index
703c5bb
..
6df23f0
100644
(file)
--- a/
include/asm-sparc64/scatterlist.h
+++ b/
include/asm-sparc64/scatterlist.h
@@
-6,7
+6,10
@@
#include <asm/types.h>
struct scatterlist {
- struct page *page;
+#ifdef CONFIG_DEBUG_SG
+ unsigned long sg_magic;
+#endif
+ unsigned long page_link;
unsigned int offset;
unsigned int length;