diff options
| author | David S. Miller <davem@davemloft.net> | 2014-08-05 22:09:19 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-08-05 22:09:19 -0400 |
| commit | 5b6ff9df056b69a3b65708bfb9923af41146c8c8 (patch) | |
| tree | 3faf774df39b4365b81b0d20ef1d3ad6acdd2a5d /arch/sparc | |
| parent | e9011d086674caeedb0ffb6eb5b8bc5920821df3 (diff) | |
sparc64: Fix up merge thinko.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc')
| -rw-r--r-- | arch/sparc/mm/init_64.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c index cdc9f145e3c3..98ac8e80adae 100644 --- a/arch/sparc/mm/init_64.c +++ b/arch/sparc/mm/init_64.c | |||
| @@ -2795,4 +2795,3 @@ void flush_tlb_kernel_range(unsigned long start, unsigned long end) | |||
| 2795 | do_flush_tlb_kernel_range(start, end); | 2795 | do_flush_tlb_kernel_range(start, end); |
| 2796 | } | 2796 | } |
| 2797 | } | 2797 | } |
| 2798 | >>>>>>> c78f77e20d2ba5d4d5e478e85a6fb42556893e2d | ||