Skip to content

Commit

Permalink
arch: Re-sort some Kbuild files to hopefully help avoid some conflicts
Browse files Browse the repository at this point in the history
Checkin:

    93ea02b arch: Clean up asm/barrier.h implementations using asm-generic/barrier.h

... unfortunately left some Kbuild files out of order, which caused
unnecessary merge conflicts, in particular with checkin:

    e3fec2f lib: Add missing arch generic-y entries for asm-generic/hash.h

Put them back in order to make the upcoming merges cleaner.

Signed-off-by: Stephen Rothwell <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: H. Peter Anvin <[email protected]>
Cc: Geert Uytterhoeven <[email protected]>
Cc: "Paul E. McKenney" <[email protected]>
Cc: Mathieu Desnoyers <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: David Miller <[email protected]>
  • Loading branch information
sfrothwell authored and H. Peter Anvin committed Jan 14, 2014
1 parent b0c29f7 commit f549ed1
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion arch/arc/include/asm/Kbuild
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
generic-y += auxvec.h
generic-y += barrier.h
generic-y += bugs.h
generic-y += bitsperlong.h
generic-y += clkdev.h
Expand Down Expand Up @@ -47,4 +48,3 @@ generic-y += user.h
generic-y += vga.h
generic-y += xor.h
generic-y += preempt.h
generic-y += barrier.h
2 changes: 1 addition & 1 deletion arch/cris/include/asm/Kbuild
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ header-y += arch-v10/
header-y += arch-v32/


generic-y += barrier.h
generic-y += clkdev.h
generic-y += exec.h
generic-y += kvm_para.h
Expand All @@ -12,4 +13,3 @@ generic-y += trace_clock.h
generic-y += vga.h
generic-y += xor.h
generic-y += preempt.h
generic-y += barrier.h
2 changes: 1 addition & 1 deletion arch/hexagon/include/asm/Kbuild
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
header-y += ucontext.h

generic-y += auxvec.h
generic-y += barrier.h
generic-y += bug.h
generic-y += bugs.h
generic-y += clkdev.h
Expand Down Expand Up @@ -54,4 +55,3 @@ generic-y += ucontext.h
generic-y += unaligned.h
generic-y += xor.h
generic-y += preempt.h
generic-y += barrier.h
2 changes: 1 addition & 1 deletion arch/microblaze/include/asm/Kbuild
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

generic-y += barrier.h
generic-y += clkdev.h
generic-y += exec.h
generic-y += trace_clock.h
generic-y += syscalls.h
generic-y += preempt.h
generic-y += barrier.h
2 changes: 1 addition & 1 deletion arch/mn10300/include/asm/Kbuild
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

generic-y += barrier.h
generic-y += clkdev.h
generic-y += exec.h
generic-y += trace_clock.h
generic-y += preempt.h
generic-y += barrier.h
2 changes: 1 addition & 1 deletion arch/parisc/include/asm/Kbuild
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@

generic-y += barrier.h
generic-y += word-at-a-time.h auxvec.h user.h cputime.h emergency-restart.h \
segment.h topology.h vga.h device.h percpu.h hw_irq.h mutex.h \
div64.h irq_regs.h kdebug.h kvm_para.h local64.h local.h param.h \
poll.h xor.h clkdev.h exec.h
generic-y += trace_clock.h
generic-y += preempt.h
generic-y += barrier.h
2 changes: 1 addition & 1 deletion arch/score/include/asm/Kbuild
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@

header-y +=

generic-y += barrier.h
generic-y += clkdev.h
generic-y += trace_clock.h
generic-y += xor.h
generic-y += preempt.h
generic-y += barrier.h

0 comments on commit f549ed1

Please sign in to comment.