git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
[pandora-kernel.git]
/
mm
/
internal.h
diff --git
a/mm/internal.h
b/mm/internal.h
index
d20e3cc
..
a3110c0
100644
(file)
--- a/
mm/internal.h
+++ b/
mm/internal.h
@@
-24,8
+24,8
@@
static inline void set_page_count(struct page *page, int v)
*/
static inline void set_page_refcounted(struct page *page)
{
*/
static inline void set_page_refcounted(struct page *page)
{
-
BUG_ON(PageCompound(page) && page_private(page) != (unsigned long)page
);
- BUG_ON(atomic_read(&page->_count));
+
VM_BUG_ON(PageCompound(page) && PageTail(page)
);
+
VM_
BUG_ON(atomic_read(&page->_count));
set_page_count(page, 1);
}
set_page_count(page, 1);
}