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

Commit 8bc6782f authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge commit 'fixes.2015.02.23a' into core/rcu 



 Conflicts:
	kernel/rcu/tree.c

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents e23604ed 3500efae

include/linux/compiler.h

+8 −4
Original line number Diff line number Diff line
@@ -20,12 +20,14 @@ 
# define __pmem		__attribute__((noderef, address_space(5)))

#ifdef CONFIG_SPARSE_RCU_POINTER

# define __rcu		__attribute__((noderef, address_space(4)))

#else

#else /* CONFIG_SPARSE_RCU_POINTER */

# define __rcu

#endif

#endif /* CONFIG_SPARSE_RCU_POINTER */

# define __private	__attribute__((noderef))

extern void __chk_user_ptr(const volatile void __user *);

extern void __chk_io_ptr(const volatile void __iomem *);

#else

# define ACCESS_PRIVATE(p, member) (*((typeof((p)->member) __force *) &(p)->member))

#else /* __CHECKER__ */

# define __user

# define __kernel

# define __safe
@@ -44,7 +46,9 @@ extern void __chk_io_ptr(const volatile void __iomem *); 
# define __percpu

# define __rcu

# define __pmem

#endif

# define __private

# define ACCESS_PRIVATE(p, member) ((p)->member)

#endif /* __CHECKER__ */



/* Indirect macros required for expanded argument pasting, eg. __LINE__. */

#define ___PASTE(a,b) a##b

include/linux/irq.h

+4 −2
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ struct irq_domain; 
 * @msi_desc:		MSI descriptor

 */

struct irq_common_data {

	unsigned int		state_use_accessors;

	unsigned int		__private state_use_accessors;

#ifdef CONFIG_NUMA

	unsigned int		node;

#endif
@@ -208,7 +208,7 @@ enum { 
	IRQD_FORWARDED_TO_VCPU		= (1 << 20),

};



#define __irqd_to_state(d)		((d)->common->state_use_accessors)

#define __irqd_to_state(d) ACCESS_PRIVATE((d)->common, state_use_accessors)



static inline bool irqd_is_setaffinity_pending(struct irq_data *d)

{
@@ -299,6 +299,8 @@ static inline void irqd_clr_forwarded_to_vcpu(struct irq_data *d) 
	__irqd_to_state(d) &= ~IRQD_FORWARDED_TO_VCPU;

}



#undef __irqd_to_state



static inline irq_hw_number_t irqd_to_hwirq(struct irq_data *d)

{

	return d->hwirq;

include/linux/rcupdate.h

+0 −2
Original line number Diff line number Diff line
@@ -360,8 +360,6 @@ void rcu_user_exit(void); 
#else

static inline void rcu_user_enter(void) { }

static inline void rcu_user_exit(void) { }

static inline void rcu_user_hooks_switch(struct task_struct *prev,

					 struct task_struct *next) { }

#endif /* CONFIG_NO_HZ_FULL */



#ifdef CONFIG_RCU_NOCB_CPU

include/linux/srcu.h

+17 −2
Original line number Diff line number Diff line
@@ -99,8 +99,23 @@ void process_srcu(struct work_struct *work); 
	}



/*

 * define and init a srcu struct at build time.

 * dont't call init_srcu_struct() nor cleanup_srcu_struct() on it.

 * Define and initialize a srcu struct at build time.

 * Do -not- call init_srcu_struct() nor cleanup_srcu_struct() on it.

 *

 * Note that although DEFINE_STATIC_SRCU() hides the name from other

 * files, the per-CPU variable rules nevertheless require that the

 * chosen name be globally unique.  These rules also prohibit use of

 * DEFINE_STATIC_SRCU() within a function.  If these rules are too

 * restrictive, declare the srcu_struct manually.  For example, in

 * each file:

 *

 *	static struct srcu_struct my_srcu;

 *

 * Then, before the first use of each my_srcu, manually initialize it:

 *

 *	init_srcu_struct(&my_srcu);

 *

 * See include/linux/percpu-defs.h for the rules on per-CPU variables.

 */

#define __DEFINE_SRCU(name, is_static)					\

	static DEFINE_PER_CPU(struct srcu_struct_array, name##_srcu_array);\

kernel/irq/internals.h

+4 −0
Original line number Diff line number Diff line
@@ -160,6 +160,8 @@ irq_put_desc_unlock(struct irq_desc *desc, unsigned long flags) 
	__irq_put_desc_unlock(desc, flags, false);

}



#define __irqd_to_state(d) ACCESS_PRIVATE((d)->common, state_use_accessors)



/*

 * Manipulation functions for irq_data.state

 */
@@ -188,6 +190,8 @@ static inline bool irqd_has_set(struct irq_data *d, unsigned int mask) 
	return __irqd_to_state(d) & mask;

}



#undef __irqd_to_state



static inline void kstat_incr_irqs_this_cpu(struct irq_desc *desc)

{

	__this_cpu_inc(*desc->kstat_irqs);