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

[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

include/linux/audit.h

+2 −2
Original line number Diff line number Diff line
@@ -260,11 +260,11 @@ extern int audit_filter_user(struct netlink_skb_parms *cb, int type); 
#ifdef CONFIG_AUDIT

/* These are defined in audit.c */

				/* 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, ...)

				      __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,

					     const char *fmt, ...)

			    __attribute__((format(printf,2,3)));

include/linux/suspend.h

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ void restore_processor_state(void); 
struct saved_context;

void __save_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);



#endif /* _LINUX_SWSUSP_H */

kernel/audit.c

+3 −3
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ struct audit_buffer { 
	struct list_head     list;

	struct sk_buff       *skb;	/* formatted skb ready to send */

	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)
@@ -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

 * 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)

{

	struct audit_buffer	*ab	= NULL;
@@ -879,7 +879,7 @@ void audit_log_end(struct audit_buffer *ab) 
/* Log an audit record.  This is a convenience function that calls

 * audit_log_start, audit_log_vformat, and audit_log_end.  It may be

 * 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, ...)

{

	struct audit_buffer *ab;

kernel/auditsc.c

+1 −1
Original line number Diff line number Diff line
@@ -803,7 +803,7 @@ static void audit_log_task_info(struct audit_buffer *ab) 
	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;

	struct audit_buffer *ab;

kernel/kexec.c

+3 −4
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ int kexec_should_crash(struct task_struct *p) 
static int kimage_is_destination_range(struct kimage *image,

				       unsigned long start, unsigned long end);

static struct page *kimage_alloc_page(struct kimage *image,

				       unsigned int gfp_mask,

				       gfp_t gfp_mask,

				       unsigned long dest);



static int do_kimage_alloc(struct kimage **rimage, unsigned long entry,
@@ -326,8 +326,7 @@ static int kimage_is_destination_range(struct kimage *image, 
	return 0;

}



static struct page *kimage_alloc_pages(unsigned int gfp_mask,

					unsigned int order)

static struct page *kimage_alloc_pages(gfp_t gfp_mask, unsigned int order)

{

	struct page *pages;
@@ -654,7 +653,7 @@ static kimage_entry_t *kimage_dst_used(struct kimage *image, 
}



static struct page *kimage_alloc_page(struct kimage *image,

					unsigned int gfp_mask,

					gfp_t gfp_mask,

					unsigned long destination)

{

	/*