Commit 9796fdd8 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds

[PATCH] gfp_t: kernel/*

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 55016f10
...@@ -260,11 +260,11 @@ extern int audit_filter_user(struct netlink_skb_parms *cb, int type); ...@@ -260,11 +260,11 @@ extern int audit_filter_user(struct netlink_skb_parms *cb, int type);
#ifdef CONFIG_AUDIT #ifdef CONFIG_AUDIT
/* These are defined in audit.c */ /* These are defined in audit.c */
/* Public API */ /* Public API */
extern void audit_log(struct audit_context *ctx, int gfp_mask, extern void audit_log(struct audit_context *ctx, gfp_t gfp_mask,
int type, const char *fmt, ...) int type, const char *fmt, ...)
__attribute__((format(printf,4,5))); __attribute__((format(printf,4,5)));
extern struct audit_buffer *audit_log_start(struct audit_context *ctx, int gfp_mask, int type); extern struct audit_buffer *audit_log_start(struct audit_context *ctx, gfp_t gfp_mask, int type);
extern void audit_log_format(struct audit_buffer *ab, extern void audit_log_format(struct audit_buffer *ab,
const char *fmt, ...) const char *fmt, ...)
__attribute__((format(printf,2,3))); __attribute__((format(printf,2,3)));
......
...@@ -71,7 +71,7 @@ void restore_processor_state(void); ...@@ -71,7 +71,7 @@ void restore_processor_state(void);
struct saved_context; struct saved_context;
void __save_processor_state(struct saved_context *ctxt); void __save_processor_state(struct saved_context *ctxt);
void __restore_processor_state(struct saved_context *ctxt); void __restore_processor_state(struct saved_context *ctxt);
extern unsigned long get_usable_page(unsigned gfp_mask); extern unsigned long get_usable_page(gfp_t gfp_mask);
extern void free_eaten_memory(void); extern void free_eaten_memory(void);
#endif /* _LINUX_SWSUSP_H */ #endif /* _LINUX_SWSUSP_H */
...@@ -133,7 +133,7 @@ struct audit_buffer { ...@@ -133,7 +133,7 @@ struct audit_buffer {
struct list_head list; struct list_head list;
struct sk_buff *skb; /* formatted skb ready to send */ struct sk_buff *skb; /* formatted skb ready to send */
struct audit_context *ctx; /* NULL or associated context */ struct audit_context *ctx; /* NULL or associated context */
int gfp_mask; gfp_t gfp_mask;
}; };
static void audit_set_pid(struct audit_buffer *ab, pid_t pid) static void audit_set_pid(struct audit_buffer *ab, pid_t pid)
...@@ -647,7 +647,7 @@ static inline void audit_get_stamp(struct audit_context *ctx, ...@@ -647,7 +647,7 @@ static inline void audit_get_stamp(struct audit_context *ctx,
* will be written at syscall exit. If there is no associated task, tsk * will be written at syscall exit. If there is no associated task, tsk
* should be NULL. */ * should be NULL. */
struct audit_buffer *audit_log_start(struct audit_context *ctx, int gfp_mask, struct audit_buffer *audit_log_start(struct audit_context *ctx, gfp_t gfp_mask,
int type) int type)
{ {
struct audit_buffer *ab = NULL; struct audit_buffer *ab = NULL;
...@@ -879,7 +879,7 @@ void audit_log_end(struct audit_buffer *ab) ...@@ -879,7 +879,7 @@ void audit_log_end(struct audit_buffer *ab)
/* Log an audit record. This is a convenience function that calls /* Log an audit record. This is a convenience function that calls
* audit_log_start, audit_log_vformat, and audit_log_end. It may be * audit_log_start, audit_log_vformat, and audit_log_end. It may be
* called in any context. */ * called in any context. */
void audit_log(struct audit_context *ctx, int gfp_mask, int type, void audit_log(struct audit_context *ctx, gfp_t gfp_mask, int type,
const char *fmt, ...) const char *fmt, ...)
{ {
struct audit_buffer *ab; struct audit_buffer *ab;
......
...@@ -803,7 +803,7 @@ static void audit_log_task_info(struct audit_buffer *ab) ...@@ -803,7 +803,7 @@ static void audit_log_task_info(struct audit_buffer *ab)
up_read(&mm->mmap_sem); up_read(&mm->mmap_sem);
} }
static void audit_log_exit(struct audit_context *context, unsigned int gfp_mask) static void audit_log_exit(struct audit_context *context, gfp_t gfp_mask)
{ {
int i; int i;
struct audit_buffer *ab; struct audit_buffer *ab;
......
...@@ -90,7 +90,7 @@ int kexec_should_crash(struct task_struct *p) ...@@ -90,7 +90,7 @@ int kexec_should_crash(struct task_struct *p)
static int kimage_is_destination_range(struct kimage *image, static int kimage_is_destination_range(struct kimage *image,
unsigned long start, unsigned long end); unsigned long start, unsigned long end);
static struct page *kimage_alloc_page(struct kimage *image, static struct page *kimage_alloc_page(struct kimage *image,
unsigned int gfp_mask, gfp_t gfp_mask,
unsigned long dest); unsigned long dest);
static int do_kimage_alloc(struct kimage **rimage, unsigned long entry, static int do_kimage_alloc(struct kimage **rimage, unsigned long entry,
...@@ -326,8 +326,7 @@ static int kimage_is_destination_range(struct kimage *image, ...@@ -326,8 +326,7 @@ static int kimage_is_destination_range(struct kimage *image,
return 0; return 0;
} }
static struct page *kimage_alloc_pages(unsigned int gfp_mask, static struct page *kimage_alloc_pages(gfp_t gfp_mask, unsigned int order)
unsigned int order)
{ {
struct page *pages; struct page *pages;
...@@ -654,7 +653,7 @@ static kimage_entry_t *kimage_dst_used(struct kimage *image, ...@@ -654,7 +653,7 @@ static kimage_entry_t *kimage_dst_used(struct kimage *image,
} }
static struct page *kimage_alloc_page(struct kimage *image, static struct page *kimage_alloc_page(struct kimage *image,
unsigned int gfp_mask, gfp_t gfp_mask,
unsigned long destination) unsigned long destination)
{ {
/* /*
......
...@@ -1095,7 +1095,7 @@ static inline void eat_page(void *page) ...@@ -1095,7 +1095,7 @@ static inline void eat_page(void *page)
*eaten_memory = c; *eaten_memory = c;
} }
unsigned long get_usable_page(unsigned gfp_mask) unsigned long get_usable_page(gfp_t gfp_mask)
{ {
unsigned long m; unsigned long m;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment