Commit 824282ca authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream' of git://

Pull MIPS fix from Ralf Baechle:
 "Revert the change of the definition of PAGE_MASK which was prettier
  but broke a few relativly rare platforms"

* 'upstream' of git://
  Revert "MIPS: page.h: Provide more readable definition for PAGE_MASK."
parents f83b2933 3b5e50ed
......@@ -31,7 +31,7 @@
#define PAGE_SHIFT 16
#define PAGE_SIZE (_AC(1,UL) << PAGE_SHIFT)
#define PAGE_MASK (~(PAGE_SIZE - 1))
#define PAGE_MASK (~((1 << PAGE_SHIFT) - 1))
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment