Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 166943
b: refs/heads/master
c: 48640d6
h: refs/heads/master
i:
  166941: 26fc836
  166939: 699257b
  166935: 8b77c4d
  166927: 5868af0
  166911: ef70879
v: v3
  • Loading branch information
Wu Fengguang authored and Linus Torvalds committed Oct 8, 2009
1 parent 6306dad commit 67d7f50
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e577ebde9fb161bdc87511763c75dfad291059e2
refs/heads/master: 48640d69f5f06fe951a4de065a7f374cb9ee6040
15 changes: 11 additions & 4 deletions trunk/Documentation/vm/page-types.c
Original file line number Diff line number Diff line change
Expand Up @@ -436,6 +436,16 @@ static uint64_t well_known_flags(uint64_t flags)
return flags;
}

static uint64_t kpageflags_flags(uint64_t flags)
{
flags = expand_overloaded_flags(flags);

if (!opt_raw)
flags = well_known_flags(flags);

return flags;
}

/*
* page frame walker
*/
Expand Down Expand Up @@ -470,10 +480,7 @@ static int hash_slot(uint64_t flags)
static void add_page(unsigned long voffset,
unsigned long offset, uint64_t flags)
{
flags = expand_overloaded_flags(flags);

if (!opt_raw)
flags = well_known_flags(flags);
flags = kpageflags_flags(flags);

if (!bit_mask_ok(flags))
return;
Expand Down

0 comments on commit 67d7f50

Please sign in to comment.