Commit 2ed3d795 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'arc-4.1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc

Pull ARC fixes from Vineet Gupta.

* tag 'arc-4.1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
  ARC: inline cache flush toggle helpers
  ARC: With earlycon in use, retire EARLY_PRINTK
  ARC: unbork !LLSC build
parents d6610270 4a8a2245
...@@ -2,19 +2,6 @@ menu "Kernel hacking" ...@@ -2,19 +2,6 @@ menu "Kernel hacking"
source "lib/Kconfig.debug" source "lib/Kconfig.debug"
config EARLY_PRINTK
bool "Early printk" if EMBEDDED
default y
help
Write kernel log output directly into the VGA buffer or to a serial
port.
This is useful for kernel debugging when your machine crashes very
early before the console code is initialized. For normal operation
it is not recommended because it looks ugly and doesn't cooperate
with klogd/syslogd or the X server. You should normally N here,
unless you want to debug such a crash.
config 16KSTACKS config 16KSTACKS
bool "Use 16Kb for kernel stacks instead of 8Kb" bool "Use 16Kb for kernel stacks instead of 8Kb"
help help
......
...@@ -99,7 +99,7 @@ static inline void atomic_##op(int i, atomic_t *v) \ ...@@ -99,7 +99,7 @@ static inline void atomic_##op(int i, atomic_t *v) \
atomic_ops_unlock(flags); \ atomic_ops_unlock(flags); \
} }
#define ATOMIC_OP_RETURN(op, c_op) \ #define ATOMIC_OP_RETURN(op, c_op, asm_op) \
static inline int atomic_##op##_return(int i, atomic_t *v) \ static inline int atomic_##op##_return(int i, atomic_t *v) \
{ \ { \
unsigned long flags; \ unsigned long flags; \
......
...@@ -266,7 +266,7 @@ static inline void __cache_line_loop(unsigned long paddr, unsigned long vaddr, ...@@ -266,7 +266,7 @@ static inline void __cache_line_loop(unsigned long paddr, unsigned long vaddr,
* Machine specific helpers for Entire D-Cache or Per Line ops * Machine specific helpers for Entire D-Cache or Per Line ops
*/ */
static unsigned int __before_dc_op(const int op) static inline unsigned int __before_dc_op(const int op)
{ {
unsigned int reg = reg; unsigned int reg = reg;
...@@ -284,7 +284,7 @@ static unsigned int __before_dc_op(const int op) ...@@ -284,7 +284,7 @@ static unsigned int __before_dc_op(const int op)
return reg; return reg;
} }
static void __after_dc_op(const int op, unsigned int reg) static inline void __after_dc_op(const int op, unsigned int reg)
{ {
if (op & OP_FLUSH) /* flush / flush-n-inv both wait */ if (op & OP_FLUSH) /* flush / flush-n-inv both wait */
while (read_aux_reg(ARC_REG_DC_CTRL) & DC_CTRL_FLUSH_STATUS); while (read_aux_reg(ARC_REG_DC_CTRL) & DC_CTRL_FLUSH_STATUS);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment