summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/mm.h6
-rw-r--r--include/linux/mmzone.h4
2 files changed, 5 insertions, 5 deletions
diff --git a/include/linux/mm.h b/include/linux/mm.h
index df425feaf3b6..c93dfffc4760 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -145,7 +145,7 @@ struct vm_operations_struct {
*
* TODO: make this structure smaller, it could be as small as 32 bytes.
*/
-typedef struct page {
+struct page {
struct list_head list; /* ->mapping has some page lists. */
struct address_space *mapping; /* The inode (or ...) we belong to. */
unsigned long index; /* Our offset within mapping. */
@@ -170,7 +170,7 @@ typedef struct page {
void *virtual; /* Kernel virtual address (NULL if
not kmapped, ie. highmem) */
#endif /* CONFIG_HIGMEM || WANT_PAGE_VIRTUAL */
-} mem_map_t;
+};
/*
* Methods to modify the page usage count.
@@ -306,7 +306,7 @@ static inline void set_page_zone(struct page *page, unsigned long zone_num)
#define NOPAGE_OOM ((struct page *) (-1))
/* The array of struct pages */
-extern mem_map_t * mem_map;
+extern struct page *mem_map;
extern void show_free_areas(void);
extern void show_free_areas_node(pg_data_t *pgdat);
diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
index 549bf6375701..d571870bef32 100644
--- a/include/linux/mmzone.h
+++ b/include/linux/mmzone.h
@@ -172,8 +172,8 @@ extern pg_data_t contig_page_data;
#endif /* !CONFIG_DISCONTIGMEM */
-#define MAP_ALIGN(x) ((((x) % sizeof(mem_map_t)) == 0) ? (x) : ((x) + \
- sizeof(mem_map_t) - ((x) % sizeof(mem_map_t))))
+#define MAP_ALIGN(x) ((((x) % sizeof(struct page)) == 0) ? (x) : ((x) + \
+ sizeof(struct page) - ((x) % sizeof(struct page))))
#endif /* !__ASSEMBLY__ */
#endif /* __KERNEL__ */