2006-08-03 20:34:17

by Alexey Dobriyan

[permalink] [raw]
Subject: [PATCH] eicon: fix define conflict with ptrace

* MODE_MASK is unused in eicon driver.
* Conflicts with a ptrace stuff on arm.

drivers/isdn/hardware/eicon/divasync.h:259:1: warning: "MODE_MASK" redefined
include2/asm/ptrace.h:48:1: warning: this is the location of the previous definition

Signed-off-by: Alexey Dobriyan <[email protected]>
---

drivers/isdn/hardware/eicon/divasync.h | 1 -
1 file changed, 1 deletion(-)

--- a/drivers/isdn/hardware/eicon/divasync.h
+++ b/drivers/isdn/hardware/eicon/divasync.h
@@ -256,7 +256,6 @@ #define WATCHDOG_MASK 0x00000008
#define NO_ORDER_CHECK_MASK 0x00000010
#define LOW_CHANNEL_MASK 0x00000020
#define NO_HSCX30_MASK 0x00000040
-#define MODE_MASK 0x00000080
#define SET_BOARD 0x00001000
#define SET_CRC4 0x00030000
#define SET_L1_TRISTATE 0x00040000


2006-08-03 20:50:37

by Alan

[permalink] [raw]
Subject: Re: [PATCH] eicon: fix define conflict with ptrace

Ar Gwe, 2006-08-04 am 00:34 +0400, ysgrifennodd Alexey Dobriyan:
> * MODE_MASK is unused in eicon driver.
> * Conflicts with a ptrace stuff on arm.
>
> drivers/isdn/hardware/eicon/divasync.h:259:1: warning: "MODE_MASK" redefined
> include2/asm/ptrace.h:48:1: warning: this is the location of the previous definition
>
> Signed-off-by: Alexey Dobriyan <[email protected]>

NAK. You need to fix all the code expecting to use the MODE_MASK with a
value of 0x00000080

2006-08-03 20:59:10

by Andrew Morton

[permalink] [raw]
Subject: Re: [PATCH] eicon: fix define conflict with ptrace

On Thu, 03 Aug 2006 22:09:59 +0100
Alan Cox <[email protected]> wrote:

> Ar Gwe, 2006-08-04 am 00:34 +0400, ysgrifennodd Alexey Dobriyan:
> > * MODE_MASK is unused in eicon driver.
> > * Conflicts with a ptrace stuff on arm.
> >
> > drivers/isdn/hardware/eicon/divasync.h:259:1: warning: "MODE_MASK" redefined
> > include2/asm/ptrace.h:48:1: warning: this is the location of the previous definition
> >
> > Signed-off-by: Alexey Dobriyan <[email protected]>
>
> NAK. You need to fix all the code expecting to use the MODE_MASK with a
> value of 0x00000080

There isn't any (under drivers/isdn, anyway).

I assume Alexey already checked that, but forgot to tell us.

Alexey, your changelogging often tends to be too terse.

2006-08-03 21:16:15

by Alexey Dobriyan

[permalink] [raw]
Subject: Re: [PATCH] eicon: fix define conflict with ptrace

On Thu, Aug 03, 2006 at 10:09:59PM +0100, Alan Cox wrote:
> Ar Gwe, 2006-08-04 am 00:34 +0400, ysgrifennodd Alexey Dobriyan:
> > * MODE_MASK is unused in eicon driver.
> > * Conflicts with a ptrace stuff on arm.
> >
> > drivers/isdn/hardware/eicon/divasync.h:259:1: warning: "MODE_MASK" redefined
> > include2/asm/ptrace.h:48:1: warning: this is the location of the previous definition

> NAK. You need to fix all the code expecting to use the MODE_MASK with a
> value of 0x00000080

OK, I understood. However, judging by tiny amount of indentation? this
define should be used when messing with "Flag" field

unsigned long Flag; /* |31-Type-16|15-Mask-0| */

of struct (typedef, actually) called "isdnProps". Other defines nearby
are unused also. More, "isdnProps" which is typedef holding this field in
turn, is also unused.

? Even less than GNU.

2006-08-04 14:36:53

by Armin Schindler

[permalink] [raw]
Subject: Re: [PATCH] eicon: fix define conflict with ptrace

On Thu, 3 Aug 2006, Alan Cox wrote:
> Ar Gwe, 2006-08-04 am 00:34 +0400, ysgrifennodd Alexey Dobriyan:
> > * MODE_MASK is unused in eicon driver.
> > * Conflicts with a ptrace stuff on arm.
> >
> > drivers/isdn/hardware/eicon/divasync.h:259:1: warning: "MODE_MASK" redefined
> > include2/asm/ptrace.h:48:1: warning: this is the location of the previous definition
> >
> > Signed-off-by: Alexey Dobriyan <[email protected]>
>
> NAK. You need to fix all the code expecting to use the MODE_MASK with a
> value of 0x00000080

The definitions in drivers/isdn/hardware/eicon/divasync.h are for
Eicon driver only. Since MODE_MASK is not really used in the Eicon/Divas
driver, the removal from this file is okay.

Armin

2006-08-04 14:40:59

by Armin Schindler

[permalink] [raw]
Subject: Re: [PATCH] eicon: fix define conflict with ptrace


If that define is now used somewhere else, it can be removed from the Eicon
driver, because it isn't really used at this time.

Armin

On Fri, 4 Aug 2006, Alexey Dobriyan wrote:
* MODE_MASK is unused in eicon driver.
* Conflicts with a ptrace stuff on arm.

drivers/isdn/hardware/eicon/divasync.h:259:1: warning: "MODE_MASK" redefined
include2/asm/ptrace.h:48:1: warning: this is the location of the previous definition

Acked-by: Armin Schindler <[email protected]>
Signed-off-by: Alexey Dobriyan <[email protected]>
---

drivers/isdn/hardware/eicon/divasync.h | 1 -
1 file changed, 1 deletion(-)

--- a/drivers/isdn/hardware/eicon/divasync.h
+++ b/drivers/isdn/hardware/eicon/divasync.h
@@ -256,7 +256,6 @@ #define WATCHDOG_MASK 0x00000008
#define NO_ORDER_CHECK_MASK 0x00000010
#define LOW_CHANNEL_MASK 0x00000020
#define NO_HSCX30_MASK 0x00000040
-#define MODE_MASK 0x00000080
#define SET_BOARD 0x00001000
#define SET_CRC4 0x00030000
#define SET_L1_TRISTATE 0x00040000