2009-09-26 16:58:15

by Jaswinder Singh Rajput

[permalink] [raw]
Subject: [PATCH] xtensa: Remove unused CONFIG XTENSA_ISS_NETWORK and XTENSA_UNALIGNED_USER


Removed unused CONFIG XTENSA_ISS_NETWORK and XTENSA_UNALIGNED_USER from Kconfig and defconfigs

Reported-by: Robert P. J. Day <[email protected]>
Signed-off-by: Jaswinder Singh Rajput <[email protected]>
Cc: Johannes Weiner <[email protected]>
Cc: Chris Zankel <[email protected]>
---
arch/xtensa/Kconfig | 13 -------------
arch/xtensa/configs/iss_defconfig | 2 --
arch/xtensa/configs/s6105_defconfig | 2 --
3 files changed, 0 insertions(+), 17 deletions(-)

diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig
index ebe228d..328d0dd 100644
--- a/arch/xtensa/Kconfig
+++ b/arch/xtensa/Kconfig
@@ -83,15 +83,6 @@ config XTENSA_VARIANT_S6000
select XTENSA_CALIBRATE_CCOUNT
endchoice

-config XTENSA_UNALIGNED_USER
- bool "Unaligned memory access in use space"
- help
- The Xtensa architecture currently does not handle unaligned
- memory accesses in hardware but through an exception handler.
- Per default, unaligned memory accesses are disabled in user space.
-
- Say Y here to enable unaligned memory access in user space.
-
config PREEMPT
bool "Preemptible Kernel"
help
@@ -122,9 +113,6 @@ config XTENSA_CALIBRATE_CCOUNT
config SERIAL_CONSOLE
def_bool n

-config XTENSA_ISS_NETWORK
- def_bool n
-
menu "Bus options"

config PCI
@@ -150,7 +138,6 @@ config XTENSA_PLATFORM_ISS
bool "ISS"
select XTENSA_CALIBRATE_CCOUNT
select SERIAL_CONSOLE
- select XTENSA_ISS_NETWORK
help
ISS is an acronym for Tensilica's Instruction Set Simulator.

diff --git a/arch/xtensa/configs/iss_defconfig b/arch/xtensa/configs/iss_defconfig
index f198540..e6c1a29 100644
--- a/arch/xtensa/configs/iss_defconfig
+++ b/arch/xtensa/configs/iss_defconfig
@@ -55,7 +55,6 @@ CONFIG_CC_ALIGN_JUMPS=0
#
CONFIG_XTENSA_VARIANT_FSF=y
CONFIG_MMU=y
-# CONFIG_XTENSA_UNALIGNED_USER is not set
# CONFIG_PREEMPT is not set
# CONFIG_MATH_EMULATION is not set
# CONFIG_HIGHMEM is not set
@@ -72,7 +71,6 @@ CONFIG_XTENSA_CPU_CLOCK=10
CONFIG_CMDLINE_BOOL=y
CONFIG_CMDLINE="console=ttyS0,38400 eth0=tuntap,,tap0 ip=192.168.168.5:192.168.168.1 root=nfs nfsroot=192.168.168.1:/opt/montavista/pro/devkit/xtensa/linux_be/target"
CONFIG_SERIAL_CONSOLE=y
-CONFIG_XTENSA_ISS_NETWORK=y

#
# Bus options
diff --git a/arch/xtensa/configs/s6105_defconfig b/arch/xtensa/configs/s6105_defconfig
index bb84fbc..bed2a49 100644
--- a/arch/xtensa/configs/s6105_defconfig
+++ b/arch/xtensa/configs/s6105_defconfig
@@ -111,13 +111,11 @@ CONFIG_VARIANT_IRQ_SWITCH=y
# CONFIG_XTENSA_VARIANT_FSF is not set
# CONFIG_XTENSA_VARIANT_DC232B is not set
CONFIG_XTENSA_VARIANT_S6000=y
-# CONFIG_XTENSA_UNALIGNED_USER is not set
CONFIG_PREEMPT=y
# CONFIG_MATH_EMULATION is not set
# CONFIG_HIGHMEM is not set
CONFIG_XTENSA_CALIBRATE_CCOUNT=y
CONFIG_SERIAL_CONSOLE=y
-# CONFIG_XTENSA_ISS_NETWORK is not set

#
# Bus options
--
1.6.0.6


2009-09-27 08:53:40

by Johannes Weiner

[permalink] [raw]
Subject: Re: [PATCH] xtensa: Remove unused CONFIG XTENSA_ISS_NETWORK and XTENSA_UNALIGNED_USER

On Sat, Sep 26, 2009 at 10:23:19PM +0530, Jaswinder Singh Rajput wrote:
>
> Removed unused CONFIG XTENSA_ISS_NETWORK and XTENSA_UNALIGNED_USER from Kconfig and defconfigs
>
> Reported-by: Robert P. J. Day <[email protected]>
> Signed-off-by: Jaswinder Singh Rajput <[email protected]>
> Cc: Johannes Weiner <[email protected]>
> Cc: Chris Zankel <[email protected]>
> ---
> arch/xtensa/Kconfig | 13 -------------
> arch/xtensa/configs/iss_defconfig | 2 --
> arch/xtensa/configs/s6105_defconfig | 2 --
> 3 files changed, 0 insertions(+), 17 deletions(-)
>
> diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig
> index ebe228d..328d0dd 100644
> --- a/arch/xtensa/Kconfig
> +++ b/arch/xtensa/Kconfig
> @@ -83,15 +83,6 @@ config XTENSA_VARIANT_S6000
> select XTENSA_CALIBRATE_CCOUNT
> endchoice
>
> -config XTENSA_UNALIGNED_USER

The code refers to CONFIG_UNALIGNED_USER, so a rename would be better
instead of removing it.

> - bool "Unaligned memory access in use space"
> - help
> - The Xtensa architecture currently does not handle unaligned
> - memory accesses in hardware but through an exception handler.
> - Per default, unaligned memory accesses are disabled in user space.
> -
> - Say Y here to enable unaligned memory access in user space.
> -
> config PREEMPT
> bool "Preemptible Kernel"
> help
> @@ -122,9 +113,6 @@ config XTENSA_CALIBRATE_CCOUNT
> config SERIAL_CONSOLE
> def_bool n
>
> -config XTENSA_ISS_NETWORK
> - def_bool n
> -

That one is of no use in the mainline kernel. I guess out-of-tree
code uses it.

> menu "Bus options"
>
> config PCI
> @@ -150,7 +138,6 @@ config XTENSA_PLATFORM_ISS
> bool "ISS"
> select XTENSA_CALIBRATE_CCOUNT
> select SERIAL_CONSOLE
> - select XTENSA_ISS_NETWORK
> help
> ISS is an acronym for Tensilica's Instruction Set Simulator.
>
> diff --git a/arch/xtensa/configs/iss_defconfig b/arch/xtensa/configs/iss_defconfig
> index f198540..e6c1a29 100644
> --- a/arch/xtensa/configs/iss_defconfig
> +++ b/arch/xtensa/configs/iss_defconfig

No need to edit auto-generated files.