diff options
| author | Wu Fengguang <fengguang.wu@intel.com> | 2009-10-07 19:32:31 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-08 10:36:39 -0400 |
| commit | 48640d69f5f06fe951a4de065a7f374cb9ee6040 (patch) | |
| tree | b8cdfc19a1b93d36436928ccd358a043e5f292aa | |
| parent | e577ebde9fb161bdc87511763c75dfad291059e2 (diff) | |
page-types: introduce kpageflags_flags()
Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
Cc: Andi Kleen <andi@firstfloor.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | Documentation/vm/page-types.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/Documentation/vm/page-types.c b/Documentation/vm/page-types.c index 56f33b63d160..11b9a03f7b10 100644 --- a/Documentation/vm/page-types.c +++ b/Documentation/vm/page-types.c | |||
| @@ -436,6 +436,16 @@ static uint64_t well_known_flags(uint64_t flags) | |||
| 436 | return flags; | 436 | return flags; |
| 437 | } | 437 | } |
| 438 | 438 | ||
| 439 | static uint64_t kpageflags_flags(uint64_t flags) | ||
| 440 | { | ||
| 441 | flags = expand_overloaded_flags(flags); | ||
| 442 | |||
| 443 | if (!opt_raw) | ||
| 444 | flags = well_known_flags(flags); | ||
| 445 | |||
| 446 | return flags; | ||
| 447 | } | ||
| 448 | |||
| 439 | /* | 449 | /* |
| 440 | * page frame walker | 450 | * page frame walker |
| 441 | */ | 451 | */ |
| @@ -470,10 +480,7 @@ static int hash_slot(uint64_t flags) | |||
| 470 | static void add_page(unsigned long voffset, | 480 | static void add_page(unsigned long voffset, |
| 471 | unsigned long offset, uint64_t flags) | 481 | unsigned long offset, uint64_t flags) |
| 472 | { | 482 | { |
| 473 | flags = expand_overloaded_flags(flags); | 483 | flags = kpageflags_flags(flags); |
| 474 | |||
| 475 | if (!opt_raw) | ||
| 476 | flags = well_known_flags(flags); | ||
| 477 | 484 | ||
| 478 | if (!bit_mask_ok(flags)) | 485 | if (!bit_mask_ok(flags)) |
| 479 | return; | 486 | return; |
