Mike Turquette
b52f4914f3
asm-generic: COMMON_CLK defines __clk_{get,put} ...
If CONFIG_COMMON_CLK is selected then __clk_get and __clk_put are
defined in drivers/clk/clk.c and declared in include/linux/clkdev.h.
Sylwester's series[0] to properly support clk_{get,put} in the common
clock framework made changes to the asm-specific clkdev.h headers, but
not the asm-generic version. Tomeu's recent changes[1] to introduce a
provider/consumer split in the clock framework uncovered this problem,
causing the following build error on any architecture using the
asm-generic clkdev.h (e.g. x86 architecture and the ACPI LPSS driver):
In file included from drivers/acpi/acpi_lpss.c:15:0:
include/linux/clkdev.h:59:5: error: conflicting types for ‘__clk_get’
int __clk_get(struct clk_core *clk);
^
In file included from arch/x86/include/generated/asm/clkdev.h:1:0,
from include/linux/clkdev.h:15,
from drivers/acpi/acpi_lpss.c:15:
include/asm-generic/clkdev.h:20:19: note: previous definition of ‘__clk_get’ was here
static inline int __clk_get(struct clk *clk) { return 1; }
^
Fixed by only declarating __clk_get and __clk_put when
CONFIG_COMMON_CLK is set.
[0] http://lkml.kernel.org/r/ <1386177127-2894-5-git-send-email-s.nawrocki@samsung.com>
[1] http://lkml.kernel.org/r/ <1409758148-20104-1-git-send-email-tomeu.vizoso@collabora.com>
Signed-off-by: Mike Turquette <mturquette@linaro.org>
2014-09-25 18:00:45 -07:00
arch: Mass conversion of smp_mb__*()
2014-04-18 14:20:48 +02:00
arch: Prepare for smp_mb__{before,after}_atomic()
2014-04-18 11:40:30 +02:00
audit: Modify a set of system calls in audit class definitions
2014-01-17 17:01:46 -05:00
audit: Modify a set of system calls in audit class definitions
2014-01-17 17:01:46 -05:00
arch: Prepare for smp_mb__{before,after}_atomic()
2014-04-18 11:40:30 +02:00
arch: Prepare for smp_mb__{before,after}_atomic()
2014-04-18 11:40:30 +02:00
bug: Make BUG() always stop the machine
2014-04-07 16:36:10 -07:00
asm-generic headers: Allow yet more arch overrides in checksum.h
2013-02-11 20:00:33 +05:30
asm-generic: COMMON_CLK defines __clk_{get,put}
2014-09-25 18:00:45 -07:00
LLVMLinux: Remove warning about returning an uninitialized variable
2014-04-09 13:44:35 -07:00
asm-generic: move cmpxchg*_local defs to cmpxchg.h
2013-03-13 06:11:05 +01:00
cputime: Generic on-demand virtual cputime accounting
2013-01-27 19:23:27 +01:00
cputime: Bring cputime -> nsecs conversion
2014-03-13 15:56:44 +01:00
cputime: Bring cputime -> nsecs conversion
2014-03-13 15:56:44 +01:00
DMA-API: Change dma_declare_coherent_memory() CPU address to phys_addr_t
2014-05-20 16:55:23 -06:00
asm-generic/dma-mapping-broken.h: Provide dma_alloc_attrs()/dma_free_attrs()
2012-12-25 20:14:54 +01:00
mm: create generic early_ioremap() support
2014-04-07 16:36:15 -07:00
arm64: fixmap: fix missing sub-page offset for earlyprintk
2014-05-03 22:20:31 +01:00
gpio: remove gpio_ensure_requested()
2014-07-24 18:18:47 +02:00
lib: hash: follow-up fixups for arch hash
2013-12-19 00:14:53 -05:00
mm: Fix generic hugetlb pte check return type.
2013-10-02 20:02:35 -04:00
readq/writeq: Add explicit lo_hi_[read|write]_q and hi_lo_[read|write]_q
2014-07-04 13:27:30 +02:00
readq/writeq: Add explicit lo_hi_[read|write]_q and hi_lo_[read|write]_q
2014-07-04 13:27:30 +02:00
Kconfig: rename HAS_IOPORT to HAS_IOPORT_MAP
2014-04-07 16:36:11 -07:00
include/asm-generic/ioctl.h: fix _IOC_TYPECHECK sparse error
2014-06-06 16:08:13 -07:00
Kconfig: rename HAS_IOPORT to HAS_IOPORT_MAP
2014-04-07 16:36:11 -07:00
KVM: add kvm_para_available to asm-generic/kvm_para.h
2013-06-05 13:21:29 +03:00
locking/mcs: Allow architecture specific asm files to be used for contended case
2014-02-09 21:18:52 +01:00
__page_to_pfn: Fix typo in comment
2013-10-14 15:28:29 +02:00
arch: Make __mutex_fastpath_lock_retval return whether fastpath succeeded or not
2013-06-26 12:10:55 +02:00
arch: Make __mutex_fastpath_lock_retval return whether fastpath succeeded or not
2013-06-26 12:10:55 +02:00
arch: Make __mutex_fastpath_lock_retval return whether fastpath succeeded or not
2013-06-26 12:10:55 +02:00
include: remove __dev* attributes.
2013-01-03 15:57:16 -08:00
pci-dma-compat: add pci_zalloc_consistent helper
2014-08-08 15:57:28 -07:00
percpu: preffity percpu header files
2014-06-17 19:12:40 -04:00
x86: define _PAGE_NUMA by reusing software bits on the PMD and PTE levels
2014-06-04 16:53:55 -07:00
sched: Remove PREEMPT_NEED_RESCHED from generic code
2013-12-11 15:52:32 +01:00
locking/rwlocks: Introduce 'qrwlocks' - fair, queued rwlocks
2014-06-06 07:58:28 +02:00
locking/rwlocks: Introduce 'qrwlocks' - fair, queued rwlocks
2014-06-06 07:58:28 +02:00
asm-generic: remove _STK_LIM_MAX
2014-05-15 00:32:09 +01:00
asm-generic: rwsem: de-PPCify rwsem.h
2014-03-14 18:02:08 +00:00
vmlinux.lds: add comments for global variables and clean up useless declarations
2013-07-03 16:07:34 -07:00
constify copy_siginfo_to_user{,32}()
2013-11-09 00:16:29 -05:00
crypto: create generic version of ablk_helper
2013-09-24 06:02:24 +10:00
syscall_get_arch: remove useless function arguments
2014-03-20 10:11:59 -04:00
burying unused conditionals
2013-02-14 09:21:15 -05:00
Fix TLB gather virtual address range invalidation corner cases
2013-08-16 08:52:46 -07:00
asm-generic: uaccess: Spelling s/a ny/any/
2014-01-02 10:45:23 +01:00
asm-generic: allow generic unaligned access if the arch supports it
2014-05-08 10:22:23 +02:00
We get rid of the general module prefix confusion with a binary config option,
2013-05-05 10:58:06 -07:00
Merge 3.16-rc5 into char-misc-next
2014-07-13 15:26:47 -07:00
include/asm-generic/vtime.h: avoid zero-length file
2013-09-30 14:31:02 -07:00
word-at-a-time: simplify big-endian zero_bytemask macro
2014-05-01 08:57:44 -07:00
b52f4914f3