diff options
-rw-r--r-- | arch/alpha/include/asm/Kbuild | 2 | ||||
-rw-r--r-- | arch/avr32/include/asm/Kbuild | 2 | ||||
-rw-r--r-- | arch/cris/include/asm/Kbuild | 2 | ||||
-rw-r--r-- | arch/frv/include/asm/Kbuild | 1 | ||||
-rw-r--r-- | arch/h8300/include/asm/Kbuild | 2 | ||||
-rw-r--r-- | arch/hexagon/include/asm/Kbuild | 1 | ||||
-rw-r--r-- | arch/ia64/include/asm/Kbuild | 1 | ||||
-rw-r--r-- | arch/m32r/include/asm/Kbuild | 2 | ||||
-rw-r--r-- | arch/m68k/include/asm/Kbuild | 1 | ||||
-rw-r--r-- | arch/microblaze/include/asm/Kbuild | 1 | ||||
-rw-r--r-- | arch/mn10300/include/asm/Kbuild | 2 | ||||
-rw-r--r-- | arch/openrisc/include/asm/Kbuild | 1 | ||||
-rw-r--r-- | arch/parisc/include/asm/Kbuild | 1 | ||||
-rw-r--r-- | arch/powerpc/include/asm/Kbuild | 1 | ||||
-rw-r--r-- | arch/s390/include/asm/Kbuild | 2 | ||||
-rw-r--r-- | arch/score/include/asm/Kbuild | 2 | ||||
-rw-r--r-- | arch/sparc/include/asm/Kbuild | 1 | ||||
-rw-r--r-- | arch/tile/include/asm/Kbuild | 1 | ||||
-rw-r--r-- | arch/um/include/asm/Kbuild | 2 | ||||
-rw-r--r-- | arch/unicore32/include/asm/Kbuild | 1 | ||||
-rw-r--r-- | arch/x86/include/asm/Kbuild | 6 | ||||
-rw-r--r-- | arch/xtensa/include/asm/Kbuild | 2 | ||||
-rw-r--r-- | include/asm-generic/clkdev.h | 28 | ||||
-rw-r--r-- | include/asm-generic/xor.h | 4 |
24 files changed, 66 insertions, 3 deletions
diff --git a/arch/alpha/include/asm/Kbuild b/arch/alpha/include/asm/Kbuild index e423defed91..d97d66334e6 100644 --- a/arch/alpha/include/asm/Kbuild +++ b/arch/alpha/include/asm/Kbuild | |||
@@ -1,5 +1,7 @@ | |||
1 | include include/asm-generic/Kbuild.asm | 1 | include include/asm-generic/Kbuild.asm |
2 | 2 | ||
3 | generic-y += clkdev.h | ||
4 | |||
3 | header-y += compiler.h | 5 | header-y += compiler.h |
4 | header-y += console.h | 6 | header-y += console.h |
5 | header-y += fpu.h | 7 | header-y += fpu.h |
diff --git a/arch/avr32/include/asm/Kbuild b/arch/avr32/include/asm/Kbuild index 3136628ba8d..e3ba7bca06f 100644 --- a/arch/avr32/include/asm/Kbuild +++ b/arch/avr32/include/asm/Kbuild | |||
@@ -1,3 +1,5 @@ | |||
1 | include include/asm-generic/Kbuild.asm | 1 | include include/asm-generic/Kbuild.asm |
2 | 2 | ||
3 | generic-y += clkdev.h | ||
4 | |||
3 | header-y += cachectl.h | 5 | header-y += cachectl.h |
diff --git a/arch/cris/include/asm/Kbuild b/arch/cris/include/asm/Kbuild index 04d02a51c5e..a8eab26a1ec 100644 --- a/arch/cris/include/asm/Kbuild +++ b/arch/cris/include/asm/Kbuild | |||
@@ -7,3 +7,5 @@ header-y += ethernet.h | |||
7 | header-y += etraxgpio.h | 7 | header-y += etraxgpio.h |
8 | header-y += rs485.h | 8 | header-y += rs485.h |
9 | header-y += sync_serial.h | 9 | header-y += sync_serial.h |
10 | |||
11 | generic-y += clkdev.h | ||
diff --git a/arch/frv/include/asm/Kbuild b/arch/frv/include/asm/Kbuild index 5be6663cfee..13cd044aabd 100644 --- a/arch/frv/include/asm/Kbuild +++ b/arch/frv/include/asm/Kbuild | |||
@@ -2,3 +2,4 @@ include include/asm-generic/Kbuild.asm | |||
2 | 2 | ||
3 | header-y += registers.h | 3 | header-y += registers.h |
4 | header-y += termios.h | 4 | header-y += termios.h |
5 | generic-y += clkdev.h | ||
diff --git a/arch/h8300/include/asm/Kbuild b/arch/h8300/include/asm/Kbuild index c68e1680da0..0e152a93c12 100644 --- a/arch/h8300/include/asm/Kbuild +++ b/arch/h8300/include/asm/Kbuild | |||
@@ -1 +1,3 @@ | |||
1 | include include/asm-generic/Kbuild.asm | 1 | include include/asm-generic/Kbuild.asm |
2 | |||
3 | generic-y += clkdev.h | ||
diff --git a/arch/hexagon/include/asm/Kbuild b/arch/hexagon/include/asm/Kbuild index 06906427c0a..3364b6966d2 100644 --- a/arch/hexagon/include/asm/Kbuild +++ b/arch/hexagon/include/asm/Kbuild | |||
@@ -7,6 +7,7 @@ header-y += user.h | |||
7 | generic-y += auxvec.h | 7 | generic-y += auxvec.h |
8 | generic-y += bug.h | 8 | generic-y += bug.h |
9 | generic-y += bugs.h | 9 | generic-y += bugs.h |
10 | generic-y += clkdev.h | ||
10 | generic-y += cputime.h | 11 | generic-y += cputime.h |
11 | generic-y += current.h | 12 | generic-y += current.h |
12 | generic-y += device.h | 13 | generic-y += device.h |
diff --git a/arch/ia64/include/asm/Kbuild b/arch/ia64/include/asm/Kbuild index d4eb9383f5f..58f3d14a6cd 100644 --- a/arch/ia64/include/asm/Kbuild +++ b/arch/ia64/include/asm/Kbuild | |||
@@ -13,3 +13,4 @@ header-y += ptrace_offsets.h | |||
13 | header-y += rse.h | 13 | header-y += rse.h |
14 | header-y += ucontext.h | 14 | header-y += ucontext.h |
15 | header-y += ustack.h | 15 | header-y += ustack.h |
16 | generic-y += clkdev.h | ||
diff --git a/arch/m32r/include/asm/Kbuild b/arch/m32r/include/asm/Kbuild index c68e1680da0..0e152a93c12 100644 --- a/arch/m32r/include/asm/Kbuild +++ b/arch/m32r/include/asm/Kbuild | |||
@@ -1 +1,3 @@ | |||
1 | include include/asm-generic/Kbuild.asm | 1 | include include/asm-generic/Kbuild.asm |
2 | |||
3 | generic-y += clkdev.h | ||
diff --git a/arch/m68k/include/asm/Kbuild b/arch/m68k/include/asm/Kbuild index a74e5d95c38..bfe675f0fae 100644 --- a/arch/m68k/include/asm/Kbuild +++ b/arch/m68k/include/asm/Kbuild | |||
@@ -2,6 +2,7 @@ include include/asm-generic/Kbuild.asm | |||
2 | header-y += cachectl.h | 2 | header-y += cachectl.h |
3 | 3 | ||
4 | generic-y += bitsperlong.h | 4 | generic-y += bitsperlong.h |
5 | generic-y += clkdev.h | ||
5 | generic-y += cputime.h | 6 | generic-y += cputime.h |
6 | generic-y += device.h | 7 | generic-y += device.h |
7 | generic-y += emergency-restart.h | 8 | generic-y += emergency-restart.h |
diff --git a/arch/microblaze/include/asm/Kbuild b/arch/microblaze/include/asm/Kbuild index db5294c30ca..48510f6cec8 100644 --- a/arch/microblaze/include/asm/Kbuild +++ b/arch/microblaze/include/asm/Kbuild | |||
@@ -1,3 +1,4 @@ | |||
1 | include include/asm-generic/Kbuild.asm | 1 | include include/asm-generic/Kbuild.asm |
2 | 2 | ||
3 | header-y += elf.h | 3 | header-y += elf.h |
4 | generic-y += clkdev.h | ||
diff --git a/arch/mn10300/include/asm/Kbuild b/arch/mn10300/include/asm/Kbuild index c68e1680da0..0d20f5526dd 100644 --- a/arch/mn10300/include/asm/Kbuild +++ b/arch/mn10300/include/asm/Kbuild | |||
@@ -1 +1,3 @@ | |||
1 | include include/asm-generic/Kbuild.asm | 1 | include include/asm-generic/Kbuild.asm |
2 | |||
3 | generic-y += clkdev.h | ||
diff --git a/arch/openrisc/include/asm/Kbuild b/arch/openrisc/include/asm/Kbuild index 0922959663a..7140b6b2644 100644 --- a/arch/openrisc/include/asm/Kbuild +++ b/arch/openrisc/include/asm/Kbuild | |||
@@ -11,6 +11,7 @@ generic-y += bug.h | |||
11 | generic-y += bugs.h | 11 | generic-y += bugs.h |
12 | generic-y += cacheflush.h | 12 | generic-y += cacheflush.h |
13 | generic-y += checksum.h | 13 | generic-y += checksum.h |
14 | generic-y += clkdev.h | ||
14 | generic-y += cmpxchg.h | 15 | generic-y += cmpxchg.h |
15 | generic-y += cmpxchg-local.h | 16 | generic-y += cmpxchg-local.h |
16 | generic-y += cputime.h | 17 | generic-y += cputime.h |
diff --git a/arch/parisc/include/asm/Kbuild b/arch/parisc/include/asm/Kbuild index 4383707d980..0587f62e5b7 100644 --- a/arch/parisc/include/asm/Kbuild +++ b/arch/parisc/include/asm/Kbuild | |||
@@ -1,4 +1,5 @@ | |||
1 | include include/asm-generic/Kbuild.asm | 1 | include include/asm-generic/Kbuild.asm |
2 | 2 | ||
3 | header-y += pdc.h | 3 | header-y += pdc.h |
4 | generic-y += clkdev.h | ||
4 | generic-y += word-at-a-time.h | 5 | generic-y += word-at-a-time.h |
diff --git a/arch/powerpc/include/asm/Kbuild b/arch/powerpc/include/asm/Kbuild index 7e313f1ed18..ace53dbde2c 100644 --- a/arch/powerpc/include/asm/Kbuild +++ b/arch/powerpc/include/asm/Kbuild | |||
@@ -35,4 +35,5 @@ header-y += types.h | |||
35 | header-y += ucontext.h | 35 | header-y += ucontext.h |
36 | header-y += unistd.h | 36 | header-y += unistd.h |
37 | 37 | ||
38 | generic-y += clkdev.h | ||
38 | generic-y += rwsem.h | 39 | generic-y += rwsem.h |
diff --git a/arch/s390/include/asm/Kbuild b/arch/s390/include/asm/Kbuild index 287d7bbb6d3..f18fc796bee 100644 --- a/arch/s390/include/asm/Kbuild +++ b/arch/s390/include/asm/Kbuild | |||
@@ -13,3 +13,5 @@ header-y += tape390.h | |||
13 | header-y += ucontext.h | 13 | header-y += ucontext.h |
14 | header-y += vtoc.h | 14 | header-y += vtoc.h |
15 | header-y += zcrypt.h | 15 | header-y += zcrypt.h |
16 | |||
17 | generic-y += clkdev.h | ||
diff --git a/arch/score/include/asm/Kbuild b/arch/score/include/asm/Kbuild index b367abd4620..ec697aeefd0 100644 --- a/arch/score/include/asm/Kbuild +++ b/arch/score/include/asm/Kbuild | |||
@@ -1,3 +1,5 @@ | |||
1 | include include/asm-generic/Kbuild.asm | 1 | include include/asm-generic/Kbuild.asm |
2 | 2 | ||
3 | header-y += | 3 | header-y += |
4 | |||
5 | generic-y += clkdev.h | ||
diff --git a/arch/sparc/include/asm/Kbuild b/arch/sparc/include/asm/Kbuild index 67f83e0a0d6..f80ff93f6f7 100644 --- a/arch/sparc/include/asm/Kbuild +++ b/arch/sparc/include/asm/Kbuild | |||
@@ -17,6 +17,7 @@ header-y += uctx.h | |||
17 | header-y += utrap.h | 17 | header-y += utrap.h |
18 | header-y += watchdog.h | 18 | header-y += watchdog.h |
19 | 19 | ||
20 | generic-y += clkdev.h | ||
20 | generic-y += div64.h | 21 | generic-y += div64.h |
21 | generic-y += local64.h | 22 | generic-y += local64.h |
22 | generic-y += irq_regs.h | 23 | generic-y += irq_regs.h |
diff --git a/arch/tile/include/asm/Kbuild b/arch/tile/include/asm/Kbuild index 5bd71994452..ea2e8ea3eb6 100644 --- a/arch/tile/include/asm/Kbuild +++ b/arch/tile/include/asm/Kbuild | |||
@@ -8,6 +8,7 @@ header-y += hardwall.h | |||
8 | 8 | ||
9 | generic-y += bug.h | 9 | generic-y += bug.h |
10 | generic-y += bugs.h | 10 | generic-y += bugs.h |
11 | generic-y += clkdev.h | ||
11 | generic-y += cputime.h | 12 | generic-y += cputime.h |
12 | generic-y += div64.h | 13 | generic-y += div64.h |
13 | generic-y += emergency-restart.h | 14 | generic-y += emergency-restart.h |
diff --git a/arch/um/include/asm/Kbuild b/arch/um/include/asm/Kbuild index fff24352255..0f6e7b32826 100644 --- a/arch/um/include/asm/Kbuild +++ b/arch/um/include/asm/Kbuild | |||
@@ -1,4 +1,4 @@ | |||
1 | generic-y += bug.h cputime.h device.h emergency-restart.h futex.h hardirq.h | 1 | generic-y += bug.h cputime.h device.h emergency-restart.h futex.h hardirq.h |
2 | generic-y += hw_irq.h irq_regs.h kdebug.h percpu.h sections.h topology.h xor.h | 2 | generic-y += hw_irq.h irq_regs.h kdebug.h percpu.h sections.h topology.h xor.h |
3 | generic-y += ftrace.h pci.h io.h param.h delay.h mutex.h current.h exec.h | 3 | generic-y += ftrace.h pci.h io.h param.h delay.h mutex.h current.h exec.h |
4 | generic-y += switch_to.h | 4 | generic-y += switch_to.h clkdev.h |
diff --git a/arch/unicore32/include/asm/Kbuild b/arch/unicore32/include/asm/Kbuild index 34b789b7111..123c59a06c1 100644 --- a/arch/unicore32/include/asm/Kbuild +++ b/arch/unicore32/include/asm/Kbuild | |||
@@ -4,6 +4,7 @@ generic-y += atomic.h | |||
4 | generic-y += auxvec.h | 4 | generic-y += auxvec.h |
5 | generic-y += bitsperlong.h | 5 | generic-y += bitsperlong.h |
6 | generic-y += bugs.h | 6 | generic-y += bugs.h |
7 | generic-y += clkdev.h | ||
7 | generic-y += cputime.h | 8 | generic-y += cputime.h |
8 | generic-y += current.h | 9 | generic-y += current.h |
9 | generic-y += device.h | 10 | generic-y += device.h |
diff --git a/arch/x86/include/asm/Kbuild b/arch/x86/include/asm/Kbuild index 1595d681343..66e5f0ef052 100644 --- a/arch/x86/include/asm/Kbuild +++ b/arch/x86/include/asm/Kbuild | |||
@@ -22,3 +22,9 @@ header-y += sigcontext32.h | |||
22 | header-y += ucontext.h | 22 | header-y += ucontext.h |
23 | header-y += vm86.h | 23 | header-y += vm86.h |
24 | header-y += vsyscall.h | 24 | header-y += vsyscall.h |
25 | |||
26 | genhdr-y += unistd_32.h | ||
27 | genhdr-y += unistd_64.h | ||
28 | genhdr-y += unistd_x32.h | ||
29 | |||
30 | generic-y += clkdev.h | ||
diff --git a/arch/xtensa/include/asm/Kbuild b/arch/xtensa/include/asm/Kbuild index c68e1680da0..0d20f5526dd 100644 --- a/arch/xtensa/include/asm/Kbuild +++ b/arch/xtensa/include/asm/Kbuild | |||
@@ -1 +1,3 @@ | |||
1 | include include/asm-generic/Kbuild.asm | 1 | include include/asm-generic/Kbuild.asm |
2 | |||
3 | generic-y += clkdev.h | ||
diff --git a/include/asm-generic/clkdev.h b/include/asm-generic/clkdev.h new file mode 100644 index 00000000000..90a32a61dd2 --- /dev/null +++ b/include/asm-generic/clkdev.h | |||
@@ -0,0 +1,28 @@ | |||
1 | /* | ||
2 | * include/asm-generic/clkdev.h | ||
3 | * | ||
4 | * Based on the ARM clkdev.h: | ||
5 | * Copyright (C) 2008 Russell King. | ||
6 | * | ||
7 | * This program is free software; you can redistribute it and/or modify | ||
8 | * it under the terms of the GNU General Public License version 2 as | ||
9 | * published by the Free Software Foundation. | ||
10 | * | ||
11 | * Helper for the clk API to assist looking up a struct clk. | ||
12 | */ | ||
13 | #ifndef __ASM_CLKDEV_H | ||
14 | #define __ASM_CLKDEV_H | ||
15 | |||
16 | #include <linux/slab.h> | ||
17 | |||
18 | struct clk; | ||
19 | |||
20 | static inline int __clk_get(struct clk *clk) { return 1; } | ||
21 | static inline void __clk_put(struct clk *clk) { } | ||
22 | |||
23 | static inline struct clk_lookup_alloc *__clkdev_alloc(size_t size) | ||
24 | { | ||
25 | return kzalloc(size, GFP_KERNEL); | ||
26 | } | ||
27 | |||
28 | #endif | ||
diff --git a/include/asm-generic/xor.h b/include/asm-generic/xor.h index 6028fb86225..b4d843225af 100644 --- a/include/asm-generic/xor.h +++ b/include/asm-generic/xor.h | |||
@@ -693,7 +693,7 @@ static struct xor_block_template xor_block_32regs = { | |||
693 | .do_5 = xor_32regs_5, | 693 | .do_5 = xor_32regs_5, |
694 | }; | 694 | }; |
695 | 695 | ||
696 | static struct xor_block_template xor_block_8regs_p = { | 696 | static struct xor_block_template xor_block_8regs_p __maybe_unused = { |
697 | .name = "8regs_prefetch", | 697 | .name = "8regs_prefetch", |
698 | .do_2 = xor_8regs_p_2, | 698 | .do_2 = xor_8regs_p_2, |
699 | .do_3 = xor_8regs_p_3, | 699 | .do_3 = xor_8regs_p_3, |
@@ -701,7 +701,7 @@ static struct xor_block_template xor_block_8regs_p = { | |||
701 | .do_5 = xor_8regs_p_5, | 701 | .do_5 = xor_8regs_p_5, |
702 | }; | 702 | }; |
703 | 703 | ||
704 | static struct xor_block_template xor_block_32regs_p = { | 704 | static struct xor_block_template xor_block_32regs_p __maybe_unused = { |
705 | .name = "32regs_prefetch", | 705 | .name = "32regs_prefetch", |
706 | .do_2 = xor_32regs_p_2, | 706 | .do_2 = xor_32regs_p_2, |
707 | .do_3 = xor_32regs_p_3, | 707 | .do_3 = xor_32regs_p_3, |