diff options
| author | Chris Metcalf <cmetcalf@tilera.com> | 2013-02-01 13:01:36 -0500 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2013-02-04 12:53:15 -0500 |
| commit | 7f04f0816848a51b761db6e7958e42f127e8264c (patch) | |
| tree | 26775c66a74e2083b3d7f459547f24c83c6ae7b3 /arch/tile/kernel/stack.c | |
| parent | a05d3f9fa3b496b2894c73bb8cbb49deb09b41db (diff) | |
| download | linux-7f04f0816848a51b761db6e7958e42f127e8264c.tar.gz linux-7f04f0816848a51b761db6e7958e42f127e8264c.tar.bz2 linux-7f04f0816848a51b761db6e7958e42f127e8264c.zip | |
tile: avoid defining INT_MASK macro in <arch/interrupts.h>
Unfortunately, this name conflicts with a different use of
the name in various places through the tree, so don't provide
it for the kernel. We preserve it for userspace to avoid
breaking any userspace code that relies on this definition.
This fixes a number of compile errors for various drivers that
are enabled by "allyesconfig".
Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
Diffstat (limited to 'arch/tile/kernel/stack.c')
| -rw-r--r-- | arch/tile/kernel/stack.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/tile/kernel/stack.c b/arch/tile/kernel/stack.c index b2f44c28dda6..ba2b36ce9b66 100644 --- a/arch/tile/kernel/stack.c +++ b/arch/tile/kernel/stack.c @@ -112,7 +112,7 @@ static struct pt_regs *valid_fault_handler(struct KBacktraceIterator* kbt) p->pc, p->sp, p->ex1); p = NULL; } - if (!kbt->profile || (INT_MASK(p->faultnum) & QUEUED_INTERRUPTS) == 0) + if (!kbt->profile || ((1ULL << p->faultnum) & QUEUED_INTERRUPTS) == 0) return p; return NULL; } |