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

Commit 3a3527b6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'core-rcu-for-linus' of... 

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

* 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  Revert "net: Make accesses to ->br_port safe for sparse RCU"
  mce: convert to rcu_dereference_index_check()
  net: Make accesses to ->br_port safe for sparse RCU
  vfs: add fs.h to define struct file
  lockdep: Add an in_workqueue_context() lockdep-based test function
  rcu: add __rcu API for later sparse checking
  rcu: add an rcu_dereference_index_check()
  tree/tiny rcu: Add debug RCU head objects
  mm: remove all rcu head initializations
  fs: remove all rcu head initializations, except on_stack initializations
  powerpc: remove all rcu head initializations
parents cc77b4db a53f4b61

arch/x86/kernel/cpu/mcheck/mce.c

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ 
static DEFINE_MUTEX(mce_read_mutex);



#define rcu_dereference_check_mce(p) \

	rcu_dereference_check((p), \

	rcu_dereference_index_check((p), \

			      rcu_read_lock_sched_held() || \

			      lockdep_is_held(&mce_read_mutex))

fs/file.c

+0 −3
Original line number Diff line number Diff line
@@ -178,7 +178,6 @@ static struct fdtable * alloc_fdtable(unsigned int nr) 
	fdt->open_fds = (fd_set *)data;

	data += nr / BITS_PER_BYTE;

	fdt->close_on_exec = (fd_set *)data;

	INIT_RCU_HEAD(&fdt->rcu);

	fdt->next = NULL;



	return fdt;
@@ -312,7 +311,6 @@ struct files_struct *dup_fd(struct files_struct *oldf, int *errorp) 
	new_fdt->close_on_exec = (fd_set *)&newf->close_on_exec_init;

	new_fdt->open_fds = (fd_set *)&newf->open_fds_init;

	new_fdt->fd = &newf->fd_array[0];

	INIT_RCU_HEAD(&new_fdt->rcu);

	new_fdt->next = NULL;



	spin_lock(&oldf->file_lock);
@@ -430,7 +428,6 @@ struct files_struct init_files = { 
		.fd		= &init_files.fd_array[0],

		.close_on_exec	= (fd_set *)&init_files.close_on_exec_init,

		.open_fds	= (fd_set *)&init_files.open_fds_init,

		.rcu		= RCU_HEAD_INIT,

	},

	.file_lock	= __SPIN_LOCK_UNLOCKED(init_task.file_lock),

};

fs/partitions/check.c

+0 −1
Original line number Diff line number Diff line
@@ -459,7 +459,6 @@ struct hd_struct *add_partition(struct gendisk *disk, int partno, 
	}



	/* everything is up and running, commence */

	INIT_RCU_HEAD(&p->rcu_head);

	rcu_assign_pointer(ptbl->part[partno], p);



	/* suppress uevent if the disk supresses it */

include/linux/compiler.h

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
# define __release(x)	__context__(x,-1)

# define __cond_lock(x,c)	((c) ? ({ __acquire(x); 1; }) : 0)

# define __percpu	__attribute__((noderef, address_space(3)))

# define __rcu

extern void __chk_user_ptr(const volatile void __user *);

extern void __chk_io_ptr(const volatile void __iomem *);

#else
@@ -34,6 +35,7 @@ extern void __chk_io_ptr(const volatile void __iomem *); 
# define __release(x) (void)0

# define __cond_lock(x,c) (c)

# define __percpu

# define __rcu

#endif



#ifdef __KERNEL__

include/linux/fdtable.h

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

#include <linux/types.h>

#include <linux/init.h>

#include <linux/fs.h>



#include <asm/atomic.h>