diff options
author | Geert Uytterhoeven <geert@linux-m68k.org> | 2011-01-17 15:21:14 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-17 15:39:07 -0500 |
commit | cf78859f520f8275318f47d7864f4459d940cb6b (patch) | |
tree | 43568b265a89800274b782c9c0506c486525e4cb /fs/xfs | |
parent | 8c34482c17d8fd07966328c7b1cfc35ee290bd1c (diff) |
xfs: Do not name variables "panic"
On platforms that call panic() inside their BUG() macro (m68k/sun3, and
all platforms that don't set HAVE_ARCH_BUG), compilation fails with:
| fs/xfs/support/debug.c: In function ‘xfs_cmn_err’:
| fs/xfs/support/debug.c:92: error: called object ‘panic’ is not a function
as the local variable "panic" conflicts with the "panic()" function.
Rename the local variable to resolve this.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/xfs')
-rw-r--r-- | fs/xfs/support/debug.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/xfs/support/debug.c b/fs/xfs/support/debug.c index e6cf955ec0f..0df88897ef8 100644 --- a/fs/xfs/support/debug.c +++ b/fs/xfs/support/debug.c | |||
@@ -75,11 +75,11 @@ xfs_cmn_err( | |||
75 | { | 75 | { |
76 | struct va_format vaf; | 76 | struct va_format vaf; |
77 | va_list args; | 77 | va_list args; |
78 | int panic = 0; | 78 | int do_panic = 0; |
79 | 79 | ||
80 | if (xfs_panic_mask && (xfs_panic_mask & panic_tag)) { | 80 | if (xfs_panic_mask && (xfs_panic_mask & panic_tag)) { |
81 | printk(KERN_ALERT "XFS: Transforming an alert into a BUG."); | 81 | printk(KERN_ALERT "XFS: Transforming an alert into a BUG."); |
82 | panic = 1; | 82 | do_panic = 1; |
83 | } | 83 | } |
84 | 84 | ||
85 | va_start(args, fmt); | 85 | va_start(args, fmt); |
@@ -89,7 +89,7 @@ xfs_cmn_err( | |||
89 | printk(KERN_ALERT "Filesystem %s: %pV", mp->m_fsname, &vaf); | 89 | printk(KERN_ALERT "Filesystem %s: %pV", mp->m_fsname, &vaf); |
90 | va_end(args); | 90 | va_end(args); |
91 | 91 | ||
92 | BUG_ON(panic); | 92 | BUG_ON(do_panic); |
93 | } | 93 | } |
94 | 94 | ||
95 | void | 95 | void |