projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge commit 'v2.6.26-rc8' into x86/xen
[firefly-linux-kernel-4.4.55.git]
/
include
/
asm-powerpc
/
scatterlist.h
diff --git
a/include/asm-powerpc/scatterlist.h
b/include/asm-powerpc/scatterlist.h
index b075f619c3b7c4c21476d4f1cf5b79e7f530084a..fcf7d55afe4599e3049713156145997fa066e1e3 100644
(file)
--- a/
include/asm-powerpc/scatterlist.h
+++ b/
include/asm-powerpc/scatterlist.h
@@
-14,7
+14,10
@@
#include <asm/dma.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;