[PATCH] misc fixes

- Missing parentheses around macro arg in __pte_offest()

- struct page_state needs to be cacheline aligned (the first seven
  fields should be in the same cacheline)

2 files changed, 3 insertions, 2 deletions

diff --git a/include/asm-i386/pgtable.h b/include/asm-i386/pgtable.h
index e05993ccacf8..ed061b5fe6af 100644
--- a/include/asm-i386/pgtable.h
+++ b/include/asm-i386/pgtable.h
@@ -256,7 +256,7 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
 
 /* Find an entry in the third-level page table.. */
 #define __pte_offset(address) \
-		((address >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))
+		(((address) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))
 #define pte_offset_kernel(dir, address) \
 	((pte_t *) pmd_page_kernel(*(dir)) +  __pte_offset(address))
 
diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h
index f02449871c07..f8aaadb1691e 100644
--- a/include/linux/page-flags.h
+++ b/include/linux/page-flags.h
@@ -6,6 +6,7 @@
 #define PAGE_FLAGS_H
 
 #include <linux/percpu.h>
+#include <linux/cache.h>
 
 /*
  * Various page->flags bits:
@@ -106,7 +107,7 @@ struct page_state {
 	unsigned long kswapd_steal;
 	unsigned long pageoutrun;
 	unsigned long allocstall;
-};
+} ____cacheline_aligned;
 
 DECLARE_PER_CPU(struct page_state, page_states);