Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 83897
b: refs/heads/master
c: f94d1d3
h: refs/heads/master
i:
  83895: f9f966f
v: v3
  • Loading branch information
Mathieu Desnoyers authored and Linus Torvalds committed Feb 7, 2008
1 parent 6fc75c8 commit 34c8009
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7b631c2de63b4475351258197409983c8189ed04
refs/heads/master: f94d1d3a1df125461a16b2888eca46d64f113e3a
4 changes: 1 addition & 3 deletions trunk/include/asm-m32r/system.h
Original file line number Diff line number Diff line change
Expand Up @@ -127,9 +127,7 @@ static inline void local_irq_disable(void)
((__typeof__(*(ptr)))__xchg_local((unsigned long)(x), (ptr), \
sizeof(*(ptr))))

#ifdef CONFIG_SMP
extern void __xchg_called_with_bad_pointer(void);
#endif

#ifdef CONFIG_CHIP_M32700_TS1
#define DCACHE_CLEAR(reg0, reg1, addr) \
Expand Down Expand Up @@ -189,9 +187,9 @@ __xchg(unsigned long x, volatile void *ptr, int size)
#endif /* CONFIG_CHIP_M32700_TS1 */
);
break;
#endif /* CONFIG_SMP */
default:
__xchg_called_with_bad_pointer();
#endif /* CONFIG_SMP */
}

local_irq_restore(flags);
Expand Down

0 comments on commit 34c8009

Please sign in to comment.