Commit f94181da authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  rcu: fix rcutorture bug
  rcu: eliminate synchronize_rcu_xxx macro
  rcu: make treercu safe for suspend and resume
  rcu: fix rcutree grace-period-latency bug on small systems
  futex: catch certain assymetric (get|put)_futex_key calls
  futex: make futex_(get|put)_key() calls symmetric
  locking, percpu counters: introduce separate lock classes
  swiotlb: clean up EXPORT_SYMBOL usage
  swiotlb: remove unnecessary declaration
  swiotlb: replace architecture-specific swiotlb.h with linux/swiotlb.h
  swiotlb: add support for systems with highmem
  swiotlb: store phys address in io_tlb_orig_addr array
  swiotlb: add hwdev to swiotlb_phys_to_bus() / swiotlb_sg_to_bus()
parents 932adbed fdbc0450

arch/ia64/include/asm/swiotlb.h

+1 −38
Original line number Diff line number Diff line
@@ -2,44 +2,7 @@ 
#define ASM_IA64__SWIOTLB_H



#include <linux/dma-mapping.h>



/* SWIOTLB interface */



extern dma_addr_t swiotlb_map_single(struct device *hwdev, void *ptr,

				     size_t size, int dir);

extern void *swiotlb_alloc_coherent(struct device *hwdev, size_t size,

				    dma_addr_t *dma_handle, gfp_t flags);

extern void swiotlb_unmap_single(struct device *hwdev, dma_addr_t dev_addr,

				 size_t size, int dir);

extern void swiotlb_sync_single_for_cpu(struct device *hwdev,

					dma_addr_t dev_addr,

					size_t size, int dir);

extern void swiotlb_sync_single_for_device(struct device *hwdev,

					   dma_addr_t dev_addr,

					   size_t size, int dir);

extern void swiotlb_sync_single_range_for_cpu(struct device *hwdev,

					      dma_addr_t dev_addr,

					      unsigned long offset,

					      size_t size, int dir);

extern void swiotlb_sync_single_range_for_device(struct device *hwdev,

						 dma_addr_t dev_addr,

						 unsigned long offset,

						 size_t size, int dir);

extern void swiotlb_sync_sg_for_cpu(struct device *hwdev,

				    struct scatterlist *sg, int nelems,

				    int dir);

extern void swiotlb_sync_sg_for_device(struct device *hwdev,

				       struct scatterlist *sg, int nelems,

				       int dir);

extern int swiotlb_map_sg(struct device *hwdev, struct scatterlist *sg,

			  int nents, int direction);

extern void swiotlb_unmap_sg(struct device *hwdev, struct scatterlist *sg,

			     int nents, int direction);

extern int swiotlb_dma_mapping_error(struct device *hwdev, dma_addr_t dma_addr);

extern void swiotlb_free_coherent(struct device *hwdev, size_t size,

				  void *vaddr, dma_addr_t dma_handle);

extern int swiotlb_dma_supported(struct device *hwdev, u64 mask);

extern void swiotlb_init(void);

#include <linux/swiotlb.h>



extern int swiotlb_force;

arch/x86/include/asm/swiotlb.h

+1 −37
Original line number Diff line number Diff line 
#ifndef _ASM_X86_SWIOTLB_H

#define _ASM_X86_SWIOTLB_H



#include <asm/dma-mapping.h>

#include <linux/swiotlb.h>



/* SWIOTLB interface */



extern dma_addr_t swiotlb_map_single(struct device *hwdev, void *ptr,

				     size_t size, int dir);

extern void *swiotlb_alloc_coherent(struct device *hwdev, size_t size,

				    dma_addr_t *dma_handle, gfp_t flags);

extern void swiotlb_unmap_single(struct device *hwdev, dma_addr_t dev_addr,

				 size_t size, int dir);

extern void swiotlb_sync_single_for_cpu(struct device *hwdev,

					dma_addr_t dev_addr,

					size_t size, int dir);

extern void swiotlb_sync_single_for_device(struct device *hwdev,

					   dma_addr_t dev_addr,

					   size_t size, int dir);

extern void swiotlb_sync_single_range_for_cpu(struct device *hwdev,

					      dma_addr_t dev_addr,

					      unsigned long offset,

					      size_t size, int dir);

extern void swiotlb_sync_single_range_for_device(struct device *hwdev,

						 dma_addr_t dev_addr,

						 unsigned long offset,

						 size_t size, int dir);

extern void swiotlb_sync_sg_for_cpu(struct device *hwdev,

				    struct scatterlist *sg, int nelems,

				    int dir);

extern void swiotlb_sync_sg_for_device(struct device *hwdev,

				       struct scatterlist *sg, int nelems,

				       int dir);

extern int swiotlb_map_sg(struct device *hwdev, struct scatterlist *sg,

			  int nents, int direction);

extern void swiotlb_unmap_sg(struct device *hwdev, struct scatterlist *sg,

			     int nents, int direction);

extern int swiotlb_dma_mapping_error(struct device *hwdev, dma_addr_t dma_addr);

extern void swiotlb_free_coherent(struct device *hwdev, size_t size,

				  void *vaddr, dma_addr_t dma_handle);

extern int swiotlb_dma_supported(struct device *hwdev, u64 mask);

extern void swiotlb_init(void);



extern int swiotlb_force;



#ifdef CONFIG_SWIOTLB

arch/x86/kernel/pci-swiotlb_64.c

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ void *swiotlb_alloc(unsigned order, unsigned long nslabs) 
	return (void *)__get_free_pages(GFP_DMA | __GFP_NOWARN, order);

}



dma_addr_t swiotlb_phys_to_bus(phys_addr_t paddr)

dma_addr_t swiotlb_phys_to_bus(struct device *hwdev, phys_addr_t paddr)

{

	return paddr;

}

include/linux/percpu_counter.h

+10 −4
Original line number Diff line number Diff line
@@ -26,8 +26,16 @@ struct percpu_counter { 


extern int percpu_counter_batch;



int percpu_counter_init(struct percpu_counter *fbc, s64 amount);

int percpu_counter_init_irq(struct percpu_counter *fbc, s64 amount);

int __percpu_counter_init(struct percpu_counter *fbc, s64 amount,

			  struct lock_class_key *key);



#define percpu_counter_init(fbc, value)					\

	({								\

		static struct lock_class_key __key;			\

									\

		__percpu_counter_init(fbc, value, &__key);		\

	})



void percpu_counter_destroy(struct percpu_counter *fbc);

void percpu_counter_set(struct percpu_counter *fbc, s64 amount);

void __percpu_counter_add(struct percpu_counter *fbc, s64 amount, s32 batch);
@@ -81,8 +89,6 @@ static inline int percpu_counter_init(struct percpu_counter *fbc, s64 amount) 
	return 0;

}



#define percpu_counter_init_irq percpu_counter_init



static inline void percpu_counter_destroy(struct percpu_counter *fbc)

{

}

include/linux/rcupdate.h

+0 −12
Original line number Diff line number Diff line
@@ -204,18 +204,6 @@ struct rcu_synchronize { 


extern void wakeme_after_rcu(struct rcu_head  *head);



#define synchronize_rcu_xxx(name, func) \

void name(void) \

{ \

	struct rcu_synchronize rcu; \

	\

	init_completion(&rcu.completion); \

	/* Will wake me after RCU finished. */ \

	func(&rcu.head, wakeme_after_rcu); \

	/* Wait for it. */ \

	wait_for_completion(&rcu.completion); \

}



/**

 * synchronize_sched - block until all CPUs have exited any non-preemptive

 * kernel code sequences.

CRA Git | Maintained and supported by SUSTech CRA and CCSE