diff options
| author | Paolo \'Blaisorblade\' Giarrusso <blaisorblade_spam@yahoo.it> | 2004-08-23 21:13:23 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-08-23 21:13:23 -0700 |
| commit | 1cded5514cb55603df3e512ccf0ee1a998f6c8b1 (patch) | |
| tree | b6206afee9ca5dd46177641255e5cd28e164ebf6 /include/linux | |
| parent | 27ef71dc2229797478a5969437c4e4421b87c708 (diff) | |
[PATCH] uml: Uml base patch
The main part of UML; it is the last distributed patch for 2.6.7 Removes skas
support from the main UML patch; apply or get conflicts.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade_spam@yahoo.it>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/gfp.h | 5 | ||||
| -rw-r--r-- | include/linux/time.h | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/include/linux/gfp.h b/include/linux/gfp.h index 8980d1fd7181..600f83c80aad 100644 --- a/include/linux/gfp.h +++ b/include/linux/gfp.h @@ -73,6 +73,11 @@ struct vm_area_struct; * For the normal case of non-DISCONTIGMEM systems the NODE_DATA() gets * optimized to &contig_page_data at compile-time. */ + +#ifndef HAVE_ARCH_FREE_PAGE +static inline void arch_free_page(struct page *page, int order) { } +#endif + extern struct page * FASTCALL(__alloc_pages(unsigned int, unsigned int, struct zonelist *)); diff --git a/include/linux/time.h b/include/linux/time.h index de41e12bbbff..8ab20a50bd1e 100644 --- a/include/linux/time.h +++ b/include/linux/time.h @@ -41,7 +41,7 @@ struct timezone { * Have the 32 bit jiffies value wrap 5 minutes after boot * so jiffies wrap bugs show up earlier. */ -#define INITIAL_JIFFIES ((unsigned long)(unsigned int) (-300*HZ)) +#define INITIAL_JIFFIES ((unsigned long)(0)) /* * Change timeval to jiffies, trying to avoid the |