diff options
| author | Greg KH <greg@press.(none)> | 2005-10-28 13:13:16 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-10-28 13:13:16 -0400 |
| commit | 6fbfddcb52d8d9fa2cd209f5ac2a1c87497d55b5 (patch) | |
| tree | c0414e89678fcef7ce3493e048d855bde781ae8d /arch/sparc64/solaris/timod.c | |
| parent | 1a222bca26ca691e83be1b08f5e96ae96d0d8cae (diff) | |
| parent | 27d1097d39509494706eaa2620ef3b1e780a3224 (diff) | |
Merge ../bleed-2.6
Diffstat (limited to 'arch/sparc64/solaris/timod.c')
| -rw-r--r-- | arch/sparc64/solaris/timod.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc64/solaris/timod.c b/arch/sparc64/solaris/timod.c index aaad29c35c83..b84e5456b025 100644 --- a/arch/sparc64/solaris/timod.c +++ b/arch/sparc64/solaris/timod.c | |||
| @@ -39,7 +39,7 @@ static char * page = NULL ; | |||
| 39 | 39 | ||
| 40 | #else | 40 | #else |
| 41 | 41 | ||
| 42 | void * mykmalloc(size_t s, int gfp) | 42 | void * mykmalloc(size_t s, gfp_t gfp) |
| 43 | { | 43 | { |
| 44 | static char * page; | 44 | static char * page; |
| 45 | static size_t free; | 45 | static size_t free; |