forked from beagleboard/linux
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
arch: Re-sort some Kbuild files to hopefully help avoid some conflicts
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
1 parent
b0c29f7
commit f549ed1
Showing
7 changed files
with
7 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |