Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 12fe32e4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'kmemtrace-for-linus' of... 

Merge branch 'kmemtrace-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'kmemtrace-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  kmemtrace: trace kfree() calls with NULL or zero-length objects
  kmemtrace: small cleanups
  kmemtrace: restore original tracing data binary format, improve ABI
  kmemtrace: kmemtrace_alloc() must fill type_id
  kmemtrace: use tracepoints
  kmemtrace, rcu: don't include unnecessary headers, allow kmemtrace w/ tracepoints
  kmemtrace, rcu: fix rcupreempt.c data structure dependencies
  kmemtrace, rcu: fix rcu_tree_trace.c data structure dependencies
  kmemtrace, rcu: fix linux/rcutree.h and linux/rcuclassic.h dependencies
  kmemtrace, mm: fix slab.h dependency problem in mm/failslab.c
  kmemtrace, kbuild: fix slab.h dependency problem in lib/decompress_unlzma.c
  kmemtrace, kbuild: fix slab.h dependency problem in lib/decompress_bunzip2.c
  kmemtrace, kbuild: fix slab.h dependency problem in lib/decompress_inflate.c
  kmemtrace, squashfs: fix slab.h dependency problem in squasfs
  kmemtrace, befs: fix slab.h dependency problem
  kmemtrace, security: fix linux/key.h header file dependencies
  kmemtrace, fs: fix linux/fdtable.h header file dependencies
  kmemtrace, fs: uninline simple_transaction_set()
  kmemtrace, fs, security: move alloc_secdata() and free_secdata() to linux/security.h
parents a6385625 2121db74

fs/befs/debug.c

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <linux/spinlock.h>

#include <linux/kernel.h>

#include <linux/fs.h>

#include <linux/slab.h>



#endif				/* __KERNEL__ */

fs/libfs.c

+16 −0
Original line number Diff line number Diff line
@@ -575,6 +575,21 @@ ssize_t memory_read_from_buffer(void *to, size_t count, loff_t *ppos, 
 * possibly a read which collects the result - which is stored in a

 * file-local buffer.

 */



void simple_transaction_set(struct file *file, size_t n)

{

	struct simple_transaction_argresp *ar = file->private_data;



	BUG_ON(n > SIMPLE_TRANSACTION_LIMIT);



	/*

	 * The barrier ensures that ar->size will really remain zero until

	 * ar->data is ready for reading.

	 */

	smp_mb();

	ar->size = n;

}



char *simple_transaction_get(struct file *file, const char __user *buf, size_t size)

{

	struct simple_transaction_argresp *ar;
@@ -820,6 +835,7 @@ EXPORT_SYMBOL(simple_sync_file); 
EXPORT_SYMBOL(simple_unlink);

EXPORT_SYMBOL(simple_read_from_buffer);

EXPORT_SYMBOL(memory_read_from_buffer);

EXPORT_SYMBOL(simple_transaction_set);

EXPORT_SYMBOL(simple_transaction_get);

EXPORT_SYMBOL(simple_transaction_read);

EXPORT_SYMBOL(simple_transaction_release);

fs/squashfs/export.c

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 
#include <linux/dcache.h>

#include <linux/exportfs.h>

#include <linux/zlib.h>

#include <linux/slab.h>



#include "squashfs_fs.h"

#include "squashfs_fs_sb.h"

include/linux/fdtable.h

+3 −1
Original line number Diff line number Diff line
@@ -5,12 +5,14 @@ 
#ifndef __LINUX_FDTABLE_H

#define __LINUX_FDTABLE_H



#include <asm/atomic.h>

#include <linux/posix_types.h>

#include <linux/compiler.h>

#include <linux/spinlock.h>

#include <linux/rcupdate.h>

#include <linux/types.h>

#include <linux/init.h>



#include <asm/atomic.h>



/*

 * The default fd array needs to be at least BITS_PER_LONG,

include/linux/fs.h

+1 −34
Original line number Diff line number Diff line
@@ -2341,19 +2341,7 @@ ssize_t simple_transaction_read(struct file *file, char __user *buf, 
				size_t size, loff_t *pos);

int simple_transaction_release(struct inode *inode, struct file *file);



static inline void simple_transaction_set(struct file *file, size_t n)

{

	struct simple_transaction_argresp *ar = file->private_data;



	BUG_ON(n > SIMPLE_TRANSACTION_LIMIT);



	/*

	 * The barrier ensures that ar->size will really remain zero until

	 * ar->data is ready for reading.

	 */

	smp_mb();

	ar->size = n;

}

void simple_transaction_set(struct file *file, size_t n);



/*

 * simple attribute files
@@ -2400,27 +2388,6 @@ ssize_t simple_attr_read(struct file *file, char __user *buf, 
ssize_t simple_attr_write(struct file *file, const char __user *buf,

			  size_t len, loff_t *ppos);





#ifdef CONFIG_SECURITY

static inline char *alloc_secdata(void)

{

	return (char *)get_zeroed_page(GFP_KERNEL);

}



static inline void free_secdata(void *secdata)

{

	free_page((unsigned long)secdata);

}

#else

static inline char *alloc_secdata(void)

{

	return (char *)1;

}



static inline void free_secdata(void *secdata)

{ }

#endif	/* CONFIG_SECURITY */



struct ctl_table;

int proc_nr_files(struct ctl_table *table, int write, struct file *filp,

		  void __user *buffer, size_t *lenp, loff_t *ppos);