Hi Linus,
my last patch for include/linux/auto_fs.h contained a typo that removed the
trailing underscores from __x86_64__.
blue skies,
Martin.
diff -urN linux-2.5.24/include/linux/auto_fs.h linux-2.5.24-s390/include/linux/auto_fs.h
--- linux-2.5.24/include/linux/auto_fs.h Fri Jun 21 00:53:40 2002
+++ linux-2.5.24-s390/include/linux/auto_fs.h Fri Jun 21 14:46:59 2002
@@ -45,7 +45,7 @@
* If so, 32-bit user-space code should be backwards compatible.
*/
-#if defined(__sparc__) || defined(__mips__) || defined(__x86_64) \
+#if defined(__sparc__) || defined(__mips__) || defined(__x86_64__) \
|| defined(__powerpc__) || defined(__s390__)
typedef unsigned int autofs_wqt_t;
#else
Followup to: <[email protected]>
By author: Martin Schwidefsky <[email protected]>
In newsgroup: linux.dev.kernel
>
> Hi Linus,
> my last patch for include/linux/auto_fs.h contained a typo that removed the
> trailing underscores from __x86_64__.
>
> blue skies,
> Martin.
>
> diff -urN linux-2.5.24/include/linux/auto_fs.h linux-2.5.24-s390/include/linux/auto_fs.h
> --- linux-2.5.24/include/linux/auto_fs.h Fri Jun 21 00:53:40 2002
> +++ linux-2.5.24-s390/include/linux/auto_fs.h Fri Jun 21 14:46:59 2002
> @@ -45,7 +45,7 @@
> * If so, 32-bit user-space code should be backwards compatible.
> */
>
> -#if defined(__sparc__) || defined(__mips__) || defined(__x86_64) \
> +#if defined(__sparc__) || defined(__mips__) || defined(__x86_64__) \
> || defined(__powerpc__) || defined(__s390__)
> typedef unsigned int autofs_wqt_t;
> #else
>
Please change this to:
#ifndef __alpha__
-hpa
--
<[email protected]> at work, <[email protected]> in private!
"Unix gives you enough rope to shoot yourself in the foot."
http://www.zytor.com/~hpa/puzzle.txt <[email protected]>
"H. Peter Anvin" <[email protected]> writes:
|> Followup to: <[email protected]>
|> By author: Martin Schwidefsky <[email protected]>
|> In newsgroup: linux.dev.kernel
|> >
|> > Hi Linus,
|> > my last patch for include/linux/auto_fs.h contained a typo that removed the
|> > trailing underscores from __x86_64__.
|> >
|> > blue skies,
|> > Martin.
|> >
|> > diff -urN linux-2.5.24/include/linux/auto_fs.h linux-2.5.24-s390/include/linux/auto_fs.h
|> > --- linux-2.5.24/include/linux/auto_fs.h Fri Jun 21 00:53:40 2002
|> > +++ linux-2.5.24-s390/include/linux/auto_fs.h Fri Jun 21 14:46:59 2002
|> > @@ -45,7 +45,7 @@
|> > * If so, 32-bit user-space code should be backwards compatible.
|> > */
|> >
|> > -#if defined(__sparc__) || defined(__mips__) || defined(__x86_64) \
|> > +#if defined(__sparc__) || defined(__mips__) || defined(__x86_64__) \
|> > || defined(__powerpc__) || defined(__s390__)
|> > typedef unsigned int autofs_wqt_t;
|> > #else
|> >
|>
|> Please change this to:
|>
|> #ifndef __alpha__
What about __ia64__?
Andreas.
--
Andreas Schwab, SuSE Labs, [email protected]
SuSE Linux AG, Deutschherrnstr. 15-19, D-90429 N?rnberg
Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5
"And now for something completely different."
Andreas Schwab wrote:
> |>
> |> Please change this to:
> |>
> |> #ifndef __alpha__
>
> What about __ia64__?
>
Oh right, that one too...
-hpa
>>>>> On Wed, 26 Jun 2002 10:23:26 -0400, "H. Peter Anvin" <[email protected]> said:
hpa> Andreas Schwab wrote:
>> |> |> Please change this to:
>> |>
>> |> #ifndef __alpha__
>>
>> What about __ia64__?
hpa> Oh right, that one too...
Isn't this the one which we agreed not to change because it would break
existing ia64 automount binaries and because we do not expect x86 automount
to run on ia64 machines?
--david
David Mosberger wrote:
>>>>>>On Wed, 26 Jun 2002 10:23:26 -0400, "H. Peter Anvin" <[email protected]> said:
>>>>>
>
> hpa> Andreas Schwab wrote:
> >> |> |> Please change this to:
> >> |>
> >> |> #ifndef __alpha__
> >>
> >> What about __ia64__?
>
> hpa> Oh right, that one too...
>
> Isn't this the one which we agreed not to change because it would break
> existing ia64 automount binaries and because we do not expect x86 automount
> to run on ia64 machines?
>
Right, hence:
#if !defined(__alpha__) && !defined(__ia64__)
Alpha and IA64 being the 64-bit architectures which will continue to use
the older interface.
-hpa
>>>>> On Thu, 27 Jun 2002 10:24:11 -0400, "H. Peter Anvin" <[email protected]> said:
hpa> David Mosberger wrote:
>>>>>>> On Wed, 26 Jun 2002 10:23:26 -0400, "H. Peter Anvin"
>>>>>>> <[email protected]> said:
>>>>>>
>>
hpa> Andreas Schwab wrote:
>> >> |> |> Please change this to:
>> >> |>
>> >> |> #ifndef __alpha__
>> >>
>> >> What about __ia64__?
>>
hpa> Oh right, that one too...
>> Isn't this the one which we agreed not to change because it
>> would break existing ia64 automount binaries and because we do
>> not expect x86 automount to run on ia64 machines?
>>
hpa> Right, hence:
hpa> #if !defined(__alpha__) && !defined(__ia64__)
hpa> Alpha and IA64 being the 64-bit architectures which will
hpa> continue to use the older interface.
Ah, OK, that looks good to me, then.
--david