Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 113347
b: refs/heads/master
c: 7aa413d
h: refs/heads/master
i:
  113345: 7b8a992
  113343: 3ca5859
v: v3
  • Loading branch information
Ingo Molnar committed Jun 19, 2008
1 parent fb3b21b commit d334617
Show file tree
Hide file tree
Showing 3 changed files with 7 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: a1bf9631be7332ce0641e299ddafad2d8223100f
refs/heads/master: 7aa413def76146f7b3784228556d9e4bc562eab3
4 changes: 2 additions & 2 deletions trunk/include/linux/mmdebug.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
#ifdef CONFIG_DEBUG_VM
#define VM_BUG_ON(cond) BUG_ON(cond)
#else
#define VM_BUG_ON(cond) do { } while(0)
#define VM_BUG_ON(cond) do { } while (0)
#endif

#ifdef CONFIG_DEBUG_VIRTUAL
#define VIRTUAL_BUG_ON(cond) BUG_ON(cond)
#else
#define VIRTUAL_BUG_ON(cond) do { } while(0)
#define VIRTUAL_BUG_ON(cond) do { } while (0)
#endif

#endif
6 changes: 4 additions & 2 deletions trunk/mm/vmalloc.c
Original file line number Diff line number Diff line change
Expand Up @@ -180,8 +180,10 @@ struct page *vmalloc_to_page(const void *vmalloc_addr)
pmd_t *pmd;
pte_t *ptep, pte;

/* XXX we might need to change this if we add VIRTUAL_BUG_ON for
* architectures that do not vmalloc module space */
/*
* XXX we might need to change this if we add VIRTUAL_BUG_ON for
* architectures that do not vmalloc module space
*/
VIRTUAL_BUG_ON(!is_vmalloc_addr(vmalloc_addr) &&
!is_module_address(addr));

Expand Down

0 comments on commit d334617

Please sign in to comment.