diff options
| author | Roland Dreier <rolandd@cisco.com> | 2005-10-28 18:50:51 -0400 |
|---|---|---|
| committer | Roland Dreier <rolandd@cisco.com> | 2005-10-28 18:50:51 -0400 |
| commit | a4da0628efd788eb199dd9df225e296035ec2539 (patch) | |
| tree | 1e611030c993e1480dc2f07f26976d2d33002b0d /arch/sparc64/solaris/timod.c | |
| parent | 70a30e16a8a9d22396a4d1e96af86e43594df584 (diff) | |
| parent | 20731945ae743034353a88c307920d1f16cf8ac8 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-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; |