Building on ia64 allowed too many options that shouldn't be allowed
there. This patch limits some of them.
Comments? Please apply to 2.6.0-test4.
--
~Randy
patch_name: it_configs.patch
patch_version: 2003-08-25.11:17:21
author: Randy.Dunlap <[email protected]>
description: restrict some config options based on architecture
product: Linux
product_versions: 260-test4
diffstat: =
drivers/block/Kconfig | 2 +-
drivers/char/Kconfig | 2 ++
drivers/pnp/Kconfig | 3 +++
3 files changed, 6 insertions(+), 1 deletion(-)
diff -Naur ./drivers/char/Kconfig~itcfg ./drivers/char/Kconfig
--- ./drivers/char/Kconfig~itcfg Fri Aug 22 16:51:02 2003
+++ ./drivers/char/Kconfig Mon Aug 25 10:48:21 2003
@@ -744,6 +744,7 @@
config NVRAM
tristate "/dev/nvram support"
+ depends on !IA64
---help---
If you say Y here and create a character special file /dev/nvram
with major number 10 and minor number 144 using mknod ("man mknod"),
@@ -1000,6 +1001,7 @@
config HANGCHECK_TIMER
tristate "Hangcheck timer"
+ depends on X86
help
The hangcheck-timer module detects when the system has gone
out to lunch past a certain margin. It can reboot the system
diff -Naur ./drivers/block/Kconfig~itcfg ./drivers/block/Kconfig
--- ./drivers/block/Kconfig~itcfg Fri Aug 22 16:53:09 2003
+++ ./drivers/block/Kconfig Mon Aug 25 10:48:21 2003
@@ -6,7 +6,7 @@
config BLK_DEV_FD
tristate "Normal floppy disk support"
- depends on !X86_PC9800
+ depends on !X86_PC9800 && !IA64
---help---
If you want to use the floppy disk drive(s) of your PC under Linux,
say Y. Information about this driver, especially important for IBM
diff -Naur ./drivers/pnp/Kconfig~itcfg ./drivers/pnp/Kconfig
--- ./drivers/pnp/Kconfig~itcfg Fri Aug 22 16:56:13 2003
+++ ./drivers/pnp/Kconfig Mon Aug 25 11:15:37 2003
@@ -2,6 +2,8 @@
# Plug and Play configuration
#
+if X86 && !X86_64
+
menu "Plug and Play support"
config PNP
@@ -60,3 +62,4 @@
endmenu
+endif
On 25 Aug 2003 20:35:36 +0200 Andi Kleen <[email protected]> wrote:
| "Randy.Dunlap" <[email protected]> writes:
|
|
| > diff -Naur ./drivers/char/Kconfig~itcfg ./drivers/char/Kconfig
| > --- ./drivers/char/Kconfig~itcfg Fri Aug 22 16:51:02 2003
| > +++ ./drivers/char/Kconfig Mon Aug 25 10:48:21 2003
| > @@ -744,6 +744,7 @@
| >
| > config NVRAM
| > tristate "/dev/nvram support"
| > + depends on !IA64
|
| depends on X86 would be probably better.
| (if some other archs use it too they can add themselves)
OK, I'll change it.
| > ---help---
| > If you say Y here and create a character special file /dev/nvram
| > with major number 10 and minor number 144 using mknod ("man mknod"),
| > @@ -1000,6 +1001,7 @@
| >
| > config HANGCHECK_TIMER
| > tristate "Hangcheck timer"
| > + depends on X86
|
| AFAIK that's not x86 specific. It should work on other architecture too.
from [email protected]:
This looks x86-specific to me,
monotonic_clock() is in arch/i386 and arch/x86_64 only.
| > say Y. Information about this driver, especially important for IBM
| > diff -Naur ./drivers/pnp/Kconfig~itcfg ./drivers/pnp/Kconfig
| > --- ./drivers/pnp/Kconfig~itcfg Fri Aug 22 16:56:13 2003
| > +++ ./drivers/pnp/Kconfig Mon Aug 25 11:15:37 2003
| > @@ -2,6 +2,8 @@
| > # Plug and Play configuration
| > #
| >
| > +if X86 && !X86_64
|
| This should be if ISA && X86 && !X86_64
OK (after lunch...).
--
~Randy [mantra: Always include kernel version.]
"Everything is relative."
"Randy.Dunlap" <[email protected]> writes:
> diff -Naur ./drivers/char/Kconfig~itcfg ./drivers/char/Kconfig
> --- ./drivers/char/Kconfig~itcfg Fri Aug 22 16:51:02 2003
> +++ ./drivers/char/Kconfig Mon Aug 25 10:48:21 2003
> @@ -744,6 +744,7 @@
>
> config NVRAM
> tristate "/dev/nvram support"
> + depends on !IA64
depends on X86 would be probably better.
(if some other archs use it too they can add themselves)
> ---help---
> If you say Y here and create a character special file /dev/nvram
> with major number 10 and minor number 144 using mknod ("man mknod"),
> @@ -1000,6 +1001,7 @@
>
> config HANGCHECK_TIMER
> tristate "Hangcheck timer"
> + depends on X86
AFAIK that's not x86 specific. It should work on other architecture too.
> say Y. Information about this driver, especially important for IBM
> diff -Naur ./drivers/pnp/Kconfig~itcfg ./drivers/pnp/Kconfig
> --- ./drivers/pnp/Kconfig~itcfg Fri Aug 22 16:56:13 2003
> +++ ./drivers/pnp/Kconfig Mon Aug 25 11:15:37 2003
> @@ -2,6 +2,8 @@
> # Plug and Play configuration
> #
>
> +if X86 && !X86_64
This should be if ISA && X86 && !X86_64
-Andi
On Mon, Aug 25, 2003 at 11:38:20AM -0700, Randy.Dunlap wrote:
> | > config HANGCHECK_TIMER
> | > tristate "Hangcheck timer"
> | > + depends on X86
> |
> | AFAIK that's not x86 specific. It should work on other architecture too.
>
> from [email protected]:
> This looks x86-specific to me,
> monotonic_clock() is in arch/i386 and arch/x86_64 only.
That's only becuase we haven't got implementations yet. It's
surely supposed to work on all platforms eventually.
Joel
--
"If you took all of the grains of sand in the world, and lined
them up end to end in a row, you'd be working for the government!"
- Mr. Interesting
Joel Becker
Senior Member of Technical Staff
Oracle Corporation
E-mail: [email protected]
Phone: (650) 506-8127
On Mon, 25 Aug 2003 11:56:19 -0700 Joel Becker <[email protected]> wrote:
| On Mon, Aug 25, 2003 at 11:38:20AM -0700, Randy.Dunlap wrote:
| > | > config HANGCHECK_TIMER
| > | > tristate "Hangcheck timer"
| > | > + depends on X86
| > |
| > | AFAIK that's not x86 specific. It should work on other architecture too.
| >
| > from [email protected]:
| > This looks x86-specific to me,
| > monotonic_clock() is in arch/i386 and arch/x86_64 only.
|
| That's only becuase we haven't got implementations yet. It's
| surely supposed to work on all platforms eventually.
OK, and then the Kconfig file can be updated, right?
--
~Randy