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 branch 'for-linus' of git://git.open-osd.org/linux-open-osd
[pandora-kernel.git]
/
include
/
linux
/
page-flags.h
diff --git
a/include/linux/page-flags.h
b/include/linux/page-flags.h
index
3e5a1b1
..
e90a673
100644
(file)
--- a/
include/linux/page-flags.h
+++ b/
include/linux/page-flags.h
@@
-124,9
+124,6
@@
enum pageflags {
/* SLOB */
PG_slob_free = PG_private,
/* SLOB */
PG_slob_free = PG_private,
-
- /* SLUB */
- PG_slub_frozen = PG_active,
};
#ifndef __GENERATING_BOUNDS_H
};
#ifndef __GENERATING_BOUNDS_H
@@
-212,8
+209,6
@@
PAGEFLAG(SwapBacked, swapbacked) __CLEARPAGEFLAG(SwapBacked, swapbacked)
__PAGEFLAG(SlobFree, slob_free)
__PAGEFLAG(SlobFree, slob_free)
-__PAGEFLAG(SlubFrozen, slub_frozen)
-
/*
* Private page markings that may be used by the filesystem that owns the page
* for its own purposes.
/*
* Private page markings that may be used by the filesystem that owns the page
* for its own purposes.