Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 33982
b: refs/heads/master
c: 020d8c0
h: refs/heads/master
v: v3
  • Loading branch information
Geert Uytterhoeven authored and Linus Torvalds committed Sep 19, 2006
1 parent 1ee705c commit 02daea4
Show file tree
Hide file tree
Showing 2 changed files with 5 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: 271fc18eead0aa330758a3b9d8a57ffe315a1978
refs/heads/master: 020d8c063b4d850b53dfbaee843c8335b7a90d26
8 changes: 4 additions & 4 deletions trunk/include/asm-m68k/page.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
#define _M68K_PAGE_H


#ifdef __KERNEL__

/* PAGE_SHIFT determines the page size */
#ifndef CONFIG_SUN3
#define PAGE_SHIFT (12)
Expand All @@ -15,8 +17,6 @@
#endif
#define PAGE_MASK (~(PAGE_SIZE-1))

#ifdef __KERNEL__

#include <asm/setup.h>

#if PAGE_SHIFT < 13
Expand Down Expand Up @@ -175,8 +175,8 @@ static inline void *__va(unsigned long x)
#define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \
VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)

#endif /* __KERNEL__ */

#include <asm-generic/page.h>

#endif /* __KERNEL__ */

#endif /* _M68K_PAGE_H */

0 comments on commit 02daea4

Please sign in to comment.