Skip to content

L
linux
Commit 8309fa38 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge master.kernel.org:/home/davem/BK/sparc-2.5 

into home.transmeta.com:/home/torvalds/v2.5/linux
parents 99cd91d7 a5508ddc
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 4540 additions and 5129 deletions
Makefile
View file @ 8309fa38
...@@ -157,7 +157,7 @@ OBJCOPY = $(CROSS_COMPILE)objcopy ...@@ -157,7 +157,7 @@ OBJCOPY = $(CROSS_COMPILE)objcopy
OBJDUMP = $(CROSS_COMPILE)objdump OBJDUMP = $(CROSS_COMPILE)objdump
AWK = awk AWK = awk
GENKSYMS = /sbin/genksyms GENKSYMS = /sbin/genksyms
KALLSYMS = /sbin/kallsyms KALLSYMS = scripts/kallsyms
PERL = perl PERL = perl
MODFLAGS = -DMODULE MODFLAGS = -DMODULE
CFLAGS_MODULE = $(MODFLAGS) CFLAGS_MODULE = $(MODFLAGS)
...@@ -335,7 +335,7 @@ ifdef CONFIG_KALLSYMS ...@@ -335,7 +335,7 @@ ifdef CONFIG_KALLSYMS
kallsyms.o := .tmp_kallsyms2.o kallsyms.o := .tmp_kallsyms2.o
quiet_cmd_kallsyms = KSYM $@ quiet_cmd_kallsyms = KSYM $@
cmd_kallsyms = $(KALLSYMS) $< > $@ cmd_kallsyms = sh $(KALLSYMS) $< $@
.tmp_kallsyms1.o: .tmp_vmlinux1 .tmp_kallsyms1.o: .tmp_vmlinux1
$(call cmd,kallsyms) $(call cmd,kallsyms)
......
arch/i386/Kconfig
View file @ 8309fa38
...@@ -1604,14 +1604,13 @@ config DEBUG_HIGHMEM ...@@ -1604,14 +1604,13 @@ config DEBUG_HIGHMEM
This options enables addition error checking for high memory systems. This options enables addition error checking for high memory systems.
Disable for production systems. Disable for production systems.
# Reimplemented RSN. config KALLSYMS
#config KALLSYMS bool "Load all symbols for debugging/kksymoops"
# bool "Load all symbols for debugging/kksymoops" depends on DEBUG_KERNEL
# depends on DEBUG_KERNEL help
# help Say Y here to let the kernel print out symbolic crash information and
# Say Y here to let the kernel print out symbolic crash information and symbolic stack backtraces. This increases the size of the kernel
# symbolic stack backtraces. This increases the size of the kernel somewhat, as all symbols have to be loaded into the kernel image.
# somewhat, as all symbols have to be loaded into the kernel image.
config X86_EXTRA_IRQS config X86_EXTRA_IRQS
bool bool
......
arch/i386/kernel/process.c
View file @ 8309fa38
...@@ -35,6 +35,7 @@ ...@@ -35,6 +35,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/mc146818rtc.h> #include <linux/mc146818rtc.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/kallsyms.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/pgtable.h> #include <asm/pgtable.h>
......
arch/i386/kernel/traps.c
View file @ 8309fa38
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/highmem.h> #include <linux/highmem.h>
#include <linux/kallsyms.h>
#ifdef CONFIG_EISA #ifdef CONFIG_EISA
#include <linux/ioport.h> #include <linux/ioport.h>
......
arch/ia64/Kconfig
View file @ 8309fa38
...@@ -813,13 +813,13 @@ config DEBUG_KERNEL ...@@ -813,13 +813,13 @@ config DEBUG_KERNEL
Say Y here if you are developing drivers or trying to debug and Say Y here if you are developing drivers or trying to debug and
identify kernel problems. identify kernel problems.
# config KALLSYMS config KALLSYMS
# bool "Load all symbols for debugging/kksymoops" bool "Load all symbols for debugging/kksymoops"
# depends on DEBUG_KERNEL depends on DEBUG_KERNEL
# help help
# Say Y here to let the kernel print out symbolic crash information and Say Y here to let the kernel print out symbolic crash information and
# symbolic stack backtraces. This increases the size of the kernel symbolic stack backtraces. This increases the size of the kernel
# somewhat, as all symbols have to be loaded into the kernel image. somewhat, as all symbols have to be loaded into the kernel image.
config IA64_PRINT_HAZARDS config IA64_PRINT_HAZARDS
bool "Print possible IA-64 dependency violations to console" bool "Print possible IA-64 dependency violations to console"
......
arch/ppc/Kconfig
View file @ 8309fa38
...@@ -1807,9 +1807,9 @@ config DEBUG_HIGHMEM ...@@ -1807,9 +1807,9 @@ config DEBUG_HIGHMEM
bool "Highmem debugging" bool "Highmem debugging"
depends on DEBUG_KERNEL && HIGHMEM depends on DEBUG_KERNEL && HIGHMEM
# config KALLSYMS config KALLSYMS
# bool "Load all symbols for debugging/kksymoops" bool "Load all symbols for debugging/kksymoops"
# depends on DEBUG_KERNEL depends on DEBUG_KERNEL
config KGDB config KGDB
bool "Include kgdb kernel debugger" bool "Include kgdb kernel debugger"
......
arch/ppc/kernel/process.c
View file @ 8309fa38
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
#include <linux/prctl.h> #include <linux/prctl.h>
#include <linux/init_task.h> #include <linux/init_task.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/kallsyms.h>
#include <asm/pgtable.h> #include <asm/pgtable.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
......
arch/s390/Kconfig
View file @ 8309fa38
...@@ -11,38 +11,6 @@ config SWAP ...@@ -11,38 +11,6 @@ config SWAP
bool bool
default y default y
config ISA
bool
help
Find out whether you have ISA slots on your motherboard. ISA is the
name of a bus system, i.e. the way the CPU talks to the other stuff
inside your box. Other bus systems are PCI, EISA, MicroChannel
(MCA) or VESA. ISA is an older system, now being displaced by PCI;
newer boards don't support it. If you have ISA, say Y, otherwise N.
config EISA
bool
---help---
The Extended Industry Standard Architecture (EISA) bus was
developed as an open alternative to the IBM MicroChannel bus.
The EISA bus provided some of the features of the IBM MicroChannel
bus while maintaining backward compatibility with cards made for
the older ISA bus. The EISA bus saw limited use between 1988 and
1995 when it was made obsolete by the PCI bus.
Say Y here if you are building a kernel for an EISA-based machine.
Otherwise, say N.
config MCA
bool
help
MicroChannel Architecture is found in some IBM PS/2 machines and
laptops. It is a bus system similar to PCI or ISA. See
<file:Documentation/mca.txt> (and especially the web page given
there) before attempting to build an MCA bus kernel.
config UID16 config UID16
bool bool
default y default y
...@@ -57,7 +25,6 @@ config RWSEM_XCHGADD_ALGORITHM ...@@ -57,7 +25,6 @@ config RWSEM_XCHGADD_ALGORITHM
config GENERIC_BUST_SPINLOCK config GENERIC_BUST_SPINLOCK
bool bool
mainmenu "Linux Kernel Configuration" mainmenu "Linux Kernel Configuration"
config ARCH_S390 config ARCH_S390
...@@ -115,6 +82,13 @@ config NR_CPUS ...@@ -115,6 +82,13 @@ config NR_CPUS
int "Maximum number of CPUs (2-32)" int "Maximum number of CPUs (2-32)"
depends on SMP depends on SMP
default "32" default "32"
help
This allows you to specify the maximum number of CPUs which this
kernel will support. The maximum supported value is 32 and the
minimum value which makes sense is 2.
This is purely to save memory - each supported CPU adds
approximately eight kilobytes to the kernel image.
comment "I/O subsystem configuration" comment "I/O subsystem configuration"
...@@ -153,6 +127,14 @@ comment "Misc" ...@@ -153,6 +127,14 @@ comment "Misc"
config PREEMPT config PREEMPT
bool "Preemptible Kernel" bool "Preemptible Kernel"
help
This option reduces the latency of the kernel when reacting to
real-time or interactive events by allowing a low priority process to
be preempted even if it is in kernel mode executing a system call.
This allows applications to run more reliably even when the system is
under load.
Say N if you are unsure.
config IPL config IPL
bool "Builtin IPL record support" bool "Builtin IPL record support"
......
arch/s390/Makefile
View file @ 8309fa38
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
LDFLAGS := -m elf_s390 LDFLAGS := -m elf_s390
OBJCOPYFLAGS := -O binary OBJCOPYFLAGS := -O binary
LDFLAGS_vmlinux := -e start LDFLAGS_vmlinux := -e start
LDFLAGS_BLOB := --format binary --oformat elf32-s390
CFLAGS += -pipe -fno-strength-reduce CFLAGS += -pipe -fno-strength-reduce
...@@ -28,18 +29,14 @@ libs-y += arch/s390/lib/ ...@@ -28,18 +29,14 @@ libs-y += arch/s390/lib/
all: image listing all: image listing
listing: vmlinux makeboot = $(call descend,arch/$(ARCH)/boot,$(1))
@$(MAKEBOOT) listing BOOTIMAGE= arch/$(ARCH)/boot/image
MAKEBOOT = $(MAKE) -C arch/$(ARCH)/boot listing install image: vmlinux
+@$(call makeboot,BOOTIMAGE=$(BOOTIMAGE) $@)
image: vmlinux
@$(MAKEBOOT) image
install: vmlinux
@$(MAKEBOOT) BOOTIMAGE=image install
archclean: archclean:
+@$(call makeboot,clean)
archmrproper: archmrproper:
......
arch/s390/boot/Makefile
View file @ 8309fa38
# #
# arch/s390/boot/Makefile # Makefile for the linux s390-specific parts of the memory manager.
# #
EXTRA_AFLAGS := -traditional EXTRA_AFLAGS := -traditional
include $(TOPDIR)/Rules.make include $(TOPDIR)/Rules.make
%.lnk: %.o quiet_cmd_listing = OBJDUMP $(echo_target)
$(LD) $(LDFLAGS) -Ttext 0x0 -o $@ $< cmd_listing = $(OBJDUMP) --disassemble --disassemble-all \
--disassemble-zeroes --reloc vmlinux > $@
%.boot: %.lnk $(obj)/image: vmlinux
$(OBJCOPY) $(OBJCOPYFLAGS) $< $@ $(call if_changed,objcopy)
image: $(TOPDIR)/vmlinux \ $(obj)/listing: vmlinux
iplfba.boot ipleckd.boot ipldump.boot $(call if_changed,listing)
$(OBJCOPY) $(OBJCOPYFLAGS) $(TOPDIR)/vmlinux image
$(NM) $(TOPDIR)/vmlinux | grep -v '\(compiled\)\|\( [aUw] \)\|\(\.\)\|\(LASH[RL]DI\)' | sort > $(TOPDIR)/System.map
listing: ../../../vmlinux image: $(obj)/image
$(OBJDUMP) --disassemble --disassemble-all --disassemble-zeroes --reloc $(TOPDIR)/vmlinux > listing
listing: $(obj)/listing
clean: clean:
rm -f image listing iplfba.boot ipleckd.boot ipldump.boot rm -f $(obj)/image $(obj)/listing
install: $(CONFIGURE) $(BOOTIMAGE) install: $(CONFIGURE) $(BOOTIMAGE)
sh -x ./install.sh $(KERNELRELEASE) $(BOOTIMAGE) $(TOPDIR)/System.map $(TOPDIR)/Kerntypes "$(INSTALL_PATH)" sh -x $(obj)/install.sh $(KERNELRELEASE) $(BOOTIMAGE) System.map Kerntypes "$(INSTALL_PATH)"
arch/s390/defconfig
View file @ 8309fa38
# #
# Automatically generated make config: don't edit # Automatically generated make config: don't edit
# #
# CONFIG_ISA is not set CONFIG_MMU=y
# CONFIG_EISA is not set CONFIG_SWAP=y
# CONFIG_MCA is not set
CONFIG_UID16=y CONFIG_UID16=y
# CONFIG_RWSEM_GENERIC_SPINLOCK is not set
CONFIG_RWSEM_XCHGADD_ALGORITHM=y CONFIG_RWSEM_XCHGADD_ALGORITHM=y
# CONFIG_GENERIC_BUST_SPINLOCK is not set
CONFIG_ARCH_S390=y CONFIG_ARCH_S390=y
# #
# Code maturity level options # Code maturity level options
# #
CONFIG_EXPERIMENTAL=y CONFIG_EXPERIMENTAL=y
CONFIG_CONFIDENTIAL=y
# #
# General setup # General setup
...@@ -27,7 +25,8 @@ CONFIG_SYSCTL=y ...@@ -27,7 +25,8 @@ CONFIG_SYSCTL=y
# Loadable module support # Loadable module support
# #
CONFIG_MODULES=y CONFIG_MODULES=y
# CONFIG_MODVERSIONS is not set # CONFIG_MODULE_UNLOAD is not set
# CONFIG_MODULE_FORCE_UNLOAD is not set
CONFIG_KMOD=y CONFIG_KMOD=y
# #
...@@ -39,13 +38,13 @@ CONFIG_KMOD=y ...@@ -39,13 +38,13 @@ CONFIG_KMOD=y
# #
CONFIG_SMP=y CONFIG_SMP=y
CONFIG_MATHEMU=y CONFIG_MATHEMU=y
CONFIG_NR_CPUS=64 CONFIG_NR_CPUS=32
# #
# I/O subsystem configuration # I/O subsystem configuration
# #
CONFIG_MACHCHK_WARNING=y CONFIG_MACHCHK_WARNING=y
CONFIG_QDIO=m CONFIG_QDIO=y
# CONFIG_QDIO_PERF_STATS is not set # CONFIG_QDIO_PERF_STATS is not set
# #
...@@ -57,7 +56,7 @@ CONFIG_IPL=y ...@@ -57,7 +56,7 @@ CONFIG_IPL=y
CONFIG_IPL_VM=y CONFIG_IPL_VM=y
CONFIG_KCORE_ELF=y CONFIG_KCORE_ELF=y
CONFIG_BINFMT_ELF=y CONFIG_BINFMT_ELF=y
# CONFIG_BINFMT_MISC is not set CONFIG_BINFMT_MISC=m
# CONFIG_PROCESS_DEBUG is not set # CONFIG_PROCESS_DEBUG is not set
CONFIG_PFAULT=y CONFIG_PFAULT=y
# CONFIG_SHARED_KERNEL is not set # CONFIG_SHARED_KERNEL is not set
...@@ -65,79 +64,15 @@ CONFIG_PFAULT=y ...@@ -65,79 +64,15 @@ CONFIG_PFAULT=y
# #
# SCSI support # SCSI support
# #
CONFIG_SCSI=m # CONFIG_SCSI is not set
#
# SCSI support type (disk, tape, CD-ROM)
#
CONFIG_BLK_DEV_SD=m
CONFIG_SD_EXTRA_DEVS=40
CONFIG_CHR_DEV_ST=m
# CONFIG_CHR_DEV_OSST is not set
CONFIG_BLK_DEV_SR=m
# CONFIG_BLK_DEV_SR_VENDOR is not set
CONFIG_SR_EXTRA_DEVS=10
CONFIG_CHR_DEV_SG=m
#
# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
#
CONFIG_SCSI_MULTI_LUN=y
# CONFIG_SCSI_REPORT_LUNS is not set
CONFIG_SCSI_CONSTANTS=y
CONFIG_SCSI_LOGGING=y
#
# SCSI low-level drivers
#
# CONFIG_SCSI_7000FASST is not set
# CONFIG_SCSI_ACARD is not set
# CONFIG_SCSI_AACRAID is not set
# CONFIG_SCSI_AIC7XXX is not set
# CONFIG_SCSI_AIC7XXX_OLD is not set
# CONFIG_SCSI_DPT_I2O is not set
# CONFIG_SCSI_ADVANSYS is not set
# CONFIG_SCSI_IN2000 is not set
# CONFIG_SCSI_AM53C974 is not set
# CONFIG_SCSI_MEGARAID is not set
# CONFIG_SCSI_BUSLOGIC is not set
# CONFIG_SCSI_DMX3191D is not set
# CONFIG_SCSI_DTC3280 is not set
# CONFIG_SCSI_EATA is not set
# CONFIG_SCSI_EATA_DMA is not set
# CONFIG_SCSI_EATA_PIO is not set
# CONFIG_SCSI_FUTURE_DOMAIN is not set
# CONFIG_SCSI_GDTH is not set
# CONFIG_SCSI_GENERIC_NCR5380 is not set
# CONFIG_SCSI_INITIO is not set
# CONFIG_SCSI_INIA100 is not set
# CONFIG_SCSI_PPA is not set
# CONFIG_SCSI_IMM is not set
# CONFIG_SCSI_NCR53C406A is not set
# CONFIG_SCSI_NCR53C7xx is not set
# CONFIG_SCSI_PAS16 is not set
# CONFIG_SCSI_PCI2000 is not set
# CONFIG_SCSI_PCI2220I is not set
# CONFIG_SCSI_PSI240I is not set
# CONFIG_SCSI_QLOGIC_FAS is not set
# CONFIG_SCSI_SYM53C416 is not set
# CONFIG_SCSI_T128 is not set
# CONFIG_SCSI_U14_34F is not set
# CONFIG_SCSI_NSP32 is not set
# CONFIG_SCSI_DEBUG is not set
#
# PCMCIA SCSI adapter support
#
# CONFIG_SCSI_PCMCIA is not set
# #
# Block device drivers # Block device drivers
# #
CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_LOOP=m
# CONFIG_BLK_DEV_NBD is not set CONFIG_BLK_DEV_NBD=m
CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_RAM_SIZE=24576 CONFIG_BLK_DEV_RAM_SIZE=4096
CONFIG_BLK_DEV_INITRD=y CONFIG_BLK_DEV_INITRD=y
CONFIG_BLK_DEV_XPRAM=m CONFIG_BLK_DEV_XPRAM=m
...@@ -147,66 +82,63 @@ CONFIG_BLK_DEV_XPRAM=m ...@@ -147,66 +82,63 @@ CONFIG_BLK_DEV_XPRAM=m
CONFIG_DASD=y CONFIG_DASD=y
CONFIG_DASD_ECKD=y CONFIG_DASD_ECKD=y
CONFIG_DASD_FBA=y CONFIG_DASD_FBA=y
# CONFIG_DASD_DIAG is not set CONFIG_DASD_DIAG=y
# #
# Multi-device support (RAID and LVM) # Multi-device support (RAID and LVM)
# #
CONFIG_MD=y CONFIG_MD=y
CONFIG_BLK_DEV_MD=m CONFIG_BLK_DEV_MD=y
# CONFIG_MD_LINEAR is not set CONFIG_MD_LINEAR=m
CONFIG_MD_RAID0=m CONFIG_MD_RAID0=m
CONFIG_MD_RAID1=m CONFIG_MD_RAID1=m
CONFIG_MD_RAID5=m CONFIG_MD_RAID5=m
# CONFIG_MD_MULTIPATH is not set CONFIG_MD_MULTIPATH=m
# CONFIG_BLK_DEV_LVM is not set # CONFIG_BLK_DEV_DM is not set
# #
# Character device drivers # Character device drivers
# #
CONFIG_UNIX98_PTYS=y CONFIG_UNIX98_PTYS=y
CONFIG_UNIX98_PTY_COUNT=256 CONFIG_UNIX98_PTY_COUNT=2048
# #
# S/390 character device drivers # S/390 character device drivers
# #
CONFIG_TN3270=y # CONFIG_TN3270 is not set
CONFIG_TN3270_CONSOLE=y
CONFIG_TN3215=y CONFIG_TN3215=y
CONFIG_TN3215_CONSOLE=y CONFIG_TN3215_CONSOLE=y
CONFIG_HWC=y CONFIG_SCLP=y
CONFIG_HWC_CONSOLE=y CONFIG_SCLP_TTY=y
CONFIG_HWC_CPI=m CONFIG_SCLP_CONSOLE=y
CONFIG_SCLP_CPI=m
CONFIG_S390_TAPE=m CONFIG_S390_TAPE=m
# #
# S/390 tape interface support # S/390 tape interface support
# #
CONFIG_S390_TAPE_CHAR=y
CONFIG_S390_TAPE_BLOCK=y CONFIG_S390_TAPE_BLOCK=y
# #
# S/390 tape hardware support # S/390 tape hardware support
# #
CONFIG_S390_TAPE_3490=m CONFIG_S390_TAPE_34XX=m
CONFIG_S390_TAPE_3480=m
# #
# Network device drivers # Network device drivers
# #
CONFIG_NETDEVICES=y CONFIG_NETDEVICES=y
# CONFIG_DUMMY is not set CONFIG_DUMMY=m
# CONFIG_BONDING is not set CONFIG_BONDING=m
# CONFIG_EQUALIZER is not set CONFIG_EQUALIZER=m
# CONFIG_TUN is not set CONFIG_TUN=m
CONFIG_NET_ETHERNET=y CONFIG_NET_ETHERNET=y
CONFIG_TR=y # CONFIG_TR is not set
# CONFIG_FDDI is not set # CONFIG_FDDI is not set
# #
# S/390 network device drivers # S/390 network device drivers
# #
CONFIG_CHANDEV=y
CONFIG_HOTPLUG=y CONFIG_HOTPLUG=y
CONFIG_LCS=m CONFIG_LCS=m
CONFIG_CTC=m CONFIG_CTC=m
...@@ -221,6 +153,7 @@ CONFIG_PACKET=y ...@@ -221,6 +153,7 @@ CONFIG_PACKET=y
# CONFIG_NETFILTER is not set # CONFIG_NETFILTER is not set
# CONFIG_FILTER is not set # CONFIG_FILTER is not set
CONFIG_UNIX=y CONFIG_UNIX=y
# CONFIG_NET_KEY is not set
CONFIG_INET=y CONFIG_INET=y
CONFIG_IP_MULTICAST=y CONFIG_IP_MULTICAST=y
# CONFIG_IP_ADVANCED_ROUTER is not set # CONFIG_IP_ADVANCED_ROUTER is not set
...@@ -231,19 +164,19 @@ CONFIG_IP_MULTICAST=y ...@@ -231,19 +164,19 @@ CONFIG_IP_MULTICAST=y
# CONFIG_ARPD is not set # CONFIG_ARPD is not set
# CONFIG_INET_ECN is not set # CONFIG_INET_ECN is not set
# CONFIG_SYN_COOKIES is not set # CONFIG_SYN_COOKIES is not set
# CONFIG_INET_AH is not set
# CONFIG_INET_ESP is not set
# CONFIG_XFRM_USER is not set
CONFIG_IPV6=m CONFIG_IPV6=m
# #
# SCTP Configuration (EXPERIMENTAL) # SCTP Configuration (EXPERIMENTAL)
# #
CONFIG_IPV6_SCTP__=m CONFIG_IPV6_SCTP__=y
# CONFIG_IP_SCTP is not set # CONFIG_IP_SCTP is not set
# CONFIG_ATM is not set # CONFIG_ATM is not set
# CONFIG_VLAN_8021Q is not set # CONFIG_VLAN_8021Q is not set
# CONFIG_LLC is not set # CONFIG_LLC is not set
# CONFIG_IPX is not set
# CONFIG_ATALK is not set
# CONFIG_DEV_APPLETALK is not set
# CONFIG_DECNET is not set # CONFIG_DECNET is not set
# CONFIG_BRIDGE is not set # CONFIG_BRIDGE is not set
# CONFIG_X25 is not set # CONFIG_X25 is not set
...@@ -257,66 +190,70 @@ CONFIG_NET_FASTROUTE=y ...@@ -257,66 +190,70 @@ CONFIG_NET_FASTROUTE=y
# #
# QoS and/or fair queueing # QoS and/or fair queueing
# #
# CONFIG_NET_SCHED is not set CONFIG_NET_SCHED=y
CONFIG_NET_SCH_CBQ=m
# CONFIG_NET_SCH_HTB is not set
CONFIG_NET_SCH_CSZ=m
CONFIG_NET_SCH_PRIO=m
CONFIG_NET_SCH_RED=m
CONFIG_NET_SCH_SFQ=m
CONFIG_NET_SCH_TEQL=m
CONFIG_NET_SCH_TBF=m
CONFIG_NET_SCH_GRED=m
CONFIG_NET_SCH_DSMARK=m
CONFIG_NET_QOS=y
CONFIG_NET_ESTIMATOR=y
CONFIG_NET_CLS=y
CONFIG_NET_CLS_TCINDEX=m
CONFIG_NET_CLS_ROUTE4=m
CONFIG_NET_CLS_ROUTE=y
CONFIG_NET_CLS_FW=m
CONFIG_NET_CLS_U32=m
CONFIG_NET_CLS_RSVP=m
CONFIG_NET_CLS_RSVP6=m
CONFIG_NET_CLS_POLICE=y
#
# Network testing
#
# CONFIG_NET_PKTGEN is not set
# #
# File systems # File systems
# #
# CONFIG_QUOTA is not set # CONFIG_QUOTA is not set
# CONFIG_QFMT_V1 is not set
# CONFIG_QFMT_V2 is not set
# CONFIG_AUTOFS_FS is not set # CONFIG_AUTOFS_FS is not set
# CONFIG_AUTOFS4_FS is not set # CONFIG_AUTOFS4_FS is not set
# CONFIG_REISERFS_FS is not set # CONFIG_REISERFS_FS is not set
# CONFIG_REISERFS_CHECK is not set
# CONFIG_REISERFS_PROC_INFO is not set
# CONFIG_ADFS_FS is not set # CONFIG_ADFS_FS is not set
# CONFIG_ADFS_FS_RW is not set
# CONFIG_AFFS_FS is not set # CONFIG_AFFS_FS is not set
# CONFIG_HFS_FS is not set # CONFIG_HFS_FS is not set
# CONFIG_BEFS_FS is not set
# CONFIG_BFS_FS is not set # CONFIG_BFS_FS is not set
CONFIG_EXT3_FS=y # CONFIG_EXT3_FS is not set
CONFIG_JBD=y # CONFIG_JBD is not set
# CONFIG_JBD_DEBUG is not set
# CONFIG_FAT_FS is not set # CONFIG_FAT_FS is not set
# CONFIG_MSDOS_FS is not set
# CONFIG_UMSDOS_FS is not set
# CONFIG_VFAT_FS is not set
# CONFIG_EFS_FS is not set # CONFIG_EFS_FS is not set
# CONFIG_JFFS_FS is not set
# CONFIG_JFFS2_FS is not set
# CONFIG_CRAMFS is not set # CONFIG_CRAMFS is not set
# CONFIG_TMPFS is not set # CONFIG_TMPFS is not set
CONFIG_RAMFS=y CONFIG_RAMFS=y
# CONFIG_ISO9660_FS is not set # CONFIG_ISO9660_FS is not set
# CONFIG_JOLIET is not set
# CONFIG_ZISOFS is not set
# CONFIG_JFS_FS is not set # CONFIG_JFS_FS is not set
# CONFIG_JFS_DEBUG is not set
# CONFIG_JFS_STATISTICS is not set
# CONFIG_MINIX_FS is not set # CONFIG_MINIX_FS is not set
# CONFIG_VXFS_FS is not set # CONFIG_VXFS_FS is not set
# CONFIG_NTFS_FS is not set # CONFIG_NTFS_FS is not set
# CONFIG_NTFS_DEBUG is not set
# CONFIG_NTFS_RW is not set
# CONFIG_HPFS_FS is not set # CONFIG_HPFS_FS is not set
CONFIG_PROC_FS=y CONFIG_PROC_FS=y
CONFIG_DEVFS_FS=y # CONFIG_DEVFS_FS is not set
# CONFIG_DEVFS_MOUNT is not set CONFIG_DEVPTS_FS=y
# CONFIG_DEVFS_DEBUG is not set
# CONFIG_DEVPTS_FS is not set
# CONFIG_QNX4FS_FS is not set # CONFIG_QNX4FS_FS is not set
# CONFIG_QNX4FS_RW is not set
# CONFIG_ROMFS_FS is not set # CONFIG_ROMFS_FS is not set
CONFIG_EXT2_FS=y CONFIG_EXT2_FS=y
# CONFIG_EXT2_FS_XATTR is not set
# CONFIG_SYSV_FS is not set # CONFIG_SYSV_FS is not set
# CONFIG_UDF_FS is not set # CONFIG_UDF_FS is not set
# CONFIG_UDF_RW is not set
# CONFIG_UFS_FS is not set # CONFIG_UFS_FS is not set
# CONFIG_UFS_FS_WRITE is not set
# CONFIG_XFS_FS is not set # CONFIG_XFS_FS is not set
# CONFIG_XFS_RT is not set
# CONFIG_XFS_QUOTA is not set
# #
# Network File Systems # Network File Systems
...@@ -324,25 +261,20 @@ CONFIG_EXT2_FS=y ...@@ -324,25 +261,20 @@ CONFIG_EXT2_FS=y
# CONFIG_CODA_FS is not set # CONFIG_CODA_FS is not set
# CONFIG_INTERMEZZO_FS is not set # CONFIG_INTERMEZZO_FS is not set
CONFIG_NFS_FS=y CONFIG_NFS_FS=y
# CONFIG_NFS_V3 is not set CONFIG_NFS_V3=y
# CONFIG_ROOT_NFS is not set # CONFIG_NFS_V4 is not set
CONFIG_NFSD=y CONFIG_NFSD=y
# CONFIG_NFSD_V3 is not set CONFIG_NFSD_V3=y
# CONFIG_NFSD_V4 is not set
# CONFIG_NFSD_TCP is not set # CONFIG_NFSD_TCP is not set
CONFIG_SUNRPC=y CONFIG_SUNRPC=y
CONFIG_LOCKD=y CONFIG_LOCKD=y
CONFIG_LOCKD_V4=y
CONFIG_EXPORTFS=y CONFIG_EXPORTFS=y
# CONFIG_CIFS is not set
# CONFIG_SMB_FS is not set # CONFIG_SMB_FS is not set
# CONFIG_NCP_FS is not set # CONFIG_NCP_FS is not set
# CONFIG_NCPFS_PACKET_SIGNING is not set # CONFIG_AFS_FS is not set
# CONFIG_NCPFS_IOCTL_LOCKING is not set
# CONFIG_NCPFS_STRONG is not set
# CONFIG_NCPFS_NFS_NS is not set
# CONFIG_NCPFS_OS2_NS is not set
# CONFIG_NCPFS_SMALLDOS is not set
# CONFIG_NCPFS_NLS is not set
# CONFIG_NCPFS_EXTRAS is not set
# CONFIG_ZISOFS_FS is not set
# #
# Partition Types # Partition Types
...@@ -360,8 +292,6 @@ CONFIG_IBM_PARTITION=y ...@@ -360,8 +292,6 @@ CONFIG_IBM_PARTITION=y
# CONFIG_ULTRIX_PARTITION is not set # CONFIG_ULTRIX_PARTITION is not set
# CONFIG_SUN_PARTITION is not set # CONFIG_SUN_PARTITION is not set
# CONFIG_EFI_PARTITION is not set # CONFIG_EFI_PARTITION is not set
# CONFIG_SMB_NLS is not set
# CONFIG_NLS is not set
# #
# Kernel hacking # Kernel hacking
...@@ -373,9 +303,20 @@ CONFIG_MAGIC_SYSRQ=y ...@@ -373,9 +303,20 @@ CONFIG_MAGIC_SYSRQ=y
# #
CONFIG_SECURITY_CAPABILITIES=y CONFIG_SECURITY_CAPABILITIES=y
#
# Cryptographic options
#
CONFIG_CRYPTO=y
# CONFIG_CRYPTO_HMAC is not set
# CONFIG_CRYPTO_MD4 is not set
# CONFIG_CRYPTO_MD5 is not set
# CONFIG_CRYPTO_SHA1 is not set
# CONFIG_CRYPTO_SHA256 is not set
# CONFIG_CRYPTO_DES is not set
# CONFIG_CRYPTO_BLOWFISH is not set
# CONFIG_CRYPTO_TEST is not set
# #
# Library routines # Library routines
# #
# CONFIG_CRC32 is not set # CONFIG_CRC32 is not set
# CONFIG_ZLIB_INFLATE is not set
# CONFIG_ZLIB_DEFLATE is not set
arch/s390/kernel/Makefile
View file @ 8309fa38
...@@ -10,7 +10,7 @@ obj-y := entry.o bitmap.o traps.o time.o process.o \ ...@@ -10,7 +10,7 @@ obj-y := entry.o bitmap.o traps.o time.o process.o \
setup.o sys_s390.o ptrace.o signal.o cpcmd.o ebcdic.o \ setup.o sys_s390.o ptrace.o signal.o cpcmd.o ebcdic.o \
semaphore.o reipl.o s390_ext.o debug.o semaphore.o reipl.o s390_ext.o debug.o
obj-$(CONFIG_MODULES) += s390_ksyms.o obj-$(CONFIG_MODULES) += s390_ksyms.o module.o
obj-$(CONFIG_SMP) += smp.o obj-$(CONFIG_SMP) += smp.o
# #
......
arch/s390/kernel/entry.S
View file @ 8309fa38
...@@ -474,10 +474,10 @@ sys_call_table: ...@@ -474,10 +474,10 @@ sys_call_table:
.long sys_adjtimex .long sys_adjtimex
.long sys_mprotect /* 125 */ .long sys_mprotect /* 125 */
.long sys_sigprocmask .long sys_sigprocmask
.long sys_create_module .long sys_ni_syscall /* old "create module" */
.long sys_init_module .long sys_init_module
.long sys_delete_module .long sys_delete_module
.long sys_get_kernel_syms /* 130 */ .long sys_ni_syscall /* 130: old get_kernel_syms */
.long sys_quotactl .long sys_quotactl
.long sys_getpgid .long sys_getpgid
.long sys_fchdir .long sys_fchdir
...@@ -514,7 +514,7 @@ sys_call_table: ...@@ -514,7 +514,7 @@ sys_call_table:
.long sys_setresuid16 .long sys_setresuid16
.long sys_getresuid16 /* 165 */ .long sys_getresuid16 /* 165 */
.long sys_ni_syscall /* for vm86 */ .long sys_ni_syscall /* for vm86 */
.long sys_query_module .long sys_ni_syscall /* old sys_query_module */
.long sys_poll .long sys_poll
.long sys_nfsservctl .long sys_nfsservctl
.long sys_setresgid16 /* 170 */ .long sys_setresgid16 /* 170 */
...@@ -596,7 +596,11 @@ sys_call_table: ...@@ -596,7 +596,11 @@ sys_call_table:
.long sys_io_submit .long sys_io_submit
.long sys_io_cancel .long sys_io_cancel
.long sys_exit_group .long sys_exit_group
.rept 255-248 .long sys_epoll_create
.long sys_epoll_ctl /* 250 */
.long sys_epoll_wait
.long sys_set_tid_address
.rept 255-252
.long sys_ni_syscall .long sys_ni_syscall
.endr .endr
......
arch/s390/kernel/module.c 0 → 100644
View file @ 8309fa38
/*
* arch/s390x/kernel/module.c - Kernel module help for s390x.
*
* S390 version
* Copyright (C) 2002 IBM Deutschland Entwicklung GmbH, IBM Corporation
* Author(s): Arnd Bergmann (arndb@de.ibm.com)
* Martin Schwidefsky (schwidefsky@de.ibm.com)
*
* based on i386 version
* Copyright (C) 2001 Rusty Russell.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <linux/module.h>
#include <linux/elf.h>
#include <linux/vmalloc.h>
#include <linux/fs.h>
#include <linux/string.h>
#include <linux/kernel.h>
#if 0
#define DEBUGP printk
#else
#define DEBUGP(fmt , ...)
#endif
void *module_alloc(unsigned long size)
{
if (size == 0)
return NULL;
return vmalloc(size);
}
/* Free memory returned from module_alloc */
void module_free(struct module *mod, void *module_region)
{
vfree(module_region);
/* FIXME: If module_region == mod->init_region, trim exception
table entries. */
}
/* s390/s390x needs additional memory for GOT/PLT sections. */
long module_core_size(const Elf32_Ehdr *hdr,
const Elf32_Shdr *sechdrs,
const char *secstrings,
struct module *module)
{
// FIXME: add space needed for GOT/PLT
return module->core_size;
}
long module_init_size(const Elf32_Ehdr *hdr,
const Elf32_Shdr *sechdrs,
const char *secstrings,
struct module *module)
{
return module->init_size;
}
int apply_relocate(Elf_Shdr *sechdrs,
const char *strtab,
unsigned int symindex,
unsigned int relsec,
struct module *me)
{
unsigned int i;
ElfW(Rel) *rel = (void *)sechdrs[relsec].sh_offset;
ElfW(Sym) *sym;
ElfW(Addr) *location;
DEBUGP("Applying relocate section %u to %u\n", relsec,
sechdrs[relsec].sh_info);
for (i = 0; i < sechdrs[relsec].sh_size / sizeof(*rel); i++) {
/* This is where to make the change */
location = (void *)sechdrs[sechdrs[relsec].sh_info].sh_offset
+ rel[i].r_offset;
/* This is the symbol it is referring to */
sym = (ElfW(Sym) *)sechdrs[symindex].sh_offset
+ ELFW(R_SYM)(rel[i].r_info);
if (!sym->st_value) {
printk(KERN_WARNING "%s: Unknown symbol %s\n",
me->name, strtab + sym->st_name);
return -ENOENT;
}
switch (ELF_R_TYPE(rel[i].r_info)) {
case R_390_8: /* Direct 8 bit. */
*(u8*) location += sym->st_value;
break;
case R_390_12: /* Direct 12 bit. */
*(u16*) location = (*(u16*) location & 0xf000) |
(sym->st_value & 0xfff);
break;
case R_390_16: /* Direct 16 bit. */
*(u16*) location += sym->st_value;
break;
case R_390_32: /* Direct 32 bit. */
*(u32*) location += sym->st_value;
break;
case R_390_PC16: /* PC relative 16 bit. */
*(u16*) location += sym->st_value
- (unsigned long )location;
case R_390_PC16DBL: /* PC relative 16 bit shifted by 1. */
*(u16*) location += (sym->st_value
- (unsigned long )location) >> 1;
case R_390_PC32: /* PC relative 32 bit. */
*(u32*) location += sym->st_value
- (unsigned long )location;
break;
case R_390_GOT12: /* 12 bit GOT offset. */
case R_390_GOT16: /* 16 bit GOT offset. */
case R_390_GOT32: /* 32 bit GOT offset. */
// FIXME: TODO
break;
case R_390_PLT16DBL: /* 16 bit PC rel. PLT shifted by 1. */
case R_390_PLT32: /* 32 bit PC relative PLT address. */
// FIXME: TODO
break;
case R_390_GLOB_DAT: /* Create GOT entry. */
case R_390_JMP_SLOT: /* Create PLT entry. */
*location = sym->st_value;
break;
case R_390_RELATIVE: /* Adjust by program base. */
// FIXME: TODO
break;
case R_390_GOTOFF: /* 32 bit offset to GOT. */
// FIXME: TODO
break;
case R_390_GOTPC: /* 32 bit PC relative offset to GOT. */
// FIXME: TODO
break;
default:
printk(KERN_ERR "module %s: Unknown relocation: %lu\n",
me->name,
(unsigned long)ELF_R_TYPE(rel[i].r_info));
return -ENOEXEC;
}
}
return 0;
}
int apply_relocate_add(Elf32_Shdr *sechdrs,
const char *strtab,
unsigned int symindex,
unsigned int relsec,
struct module *me)
{
printk(KERN_ERR "module %s: ADD RELOCATION unsupported\n",
me->name);
return -ENOEXEC;
}
int module_finalize(const Elf_Ehdr *hdr,
const Elf_Shdr *sechdrs,
struct module *me)
{
return 0;
}
arch/s390/kernel/setup.c
View file @ 8309fa38
...@@ -164,9 +164,9 @@ __setup("condev=", condev_setup); ...@@ -164,9 +164,9 @@ __setup("condev=", condev_setup);
static int __init conmode_setup(char *str) static int __init conmode_setup(char *str)
{ {
#if defined(CONFIG_HWC_CONSOLE) #if defined(CONFIG_SCLP_CONSOLE)
if (strncmp(str, "hwc", 4) == 0) if (strncmp(str, "hwc", 4) == 0 || strncmp(str, "sclp", 5) == 0)
SET_CONSOLE_HWC; SET_CONSOLE_SCLP;
#endif #endif
#if defined(CONFIG_TN3215_CONSOLE) #if defined(CONFIG_TN3215_CONSOLE)
if (strncmp(str, "3215", 5) == 0) if (strncmp(str, "3215", 5) == 0)
...@@ -198,8 +198,8 @@ static void __init conmode_default(void) ...@@ -198,8 +198,8 @@ static void __init conmode_default(void)
*/ */
cpcmd("TERM CONMODE 3215", NULL, 0); cpcmd("TERM CONMODE 3215", NULL, 0);
if (ptr == NULL) { if (ptr == NULL) {
#if defined(CONFIG_HWC_CONSOLE) #if defined(CONFIG_SCLP_CONSOLE)
SET_CONSOLE_HWC; SET_CONSOLE_SCLP;
#endif #endif
return; return;
} }
...@@ -208,16 +208,16 @@ static void __init conmode_default(void) ...@@ -208,16 +208,16 @@ static void __init conmode_default(void)
SET_CONSOLE_3270; SET_CONSOLE_3270;
#elif defined(CONFIG_TN3215_CONSOLE) #elif defined(CONFIG_TN3215_CONSOLE)
SET_CONSOLE_3215; SET_CONSOLE_3215;
#elif defined(CONFIG_HWC_CONSOLE) #elif defined(CONFIG_SCLP_CONSOLE)
SET_CONSOLE_HWC; SET_CONSOLE_SCLP;
#endif #endif
} else if (strncmp(ptr + 8, "3215", 4) == 0) { } else if (strncmp(ptr + 8, "3215", 4) == 0) {
#if defined(CONFIG_TN3215_CONSOLE) #if defined(CONFIG_TN3215_CONSOLE)
SET_CONSOLE_3215; SET_CONSOLE_3215;
#elif defined(CONFIG_TN3270_CONSOLE) #elif defined(CONFIG_TN3270_CONSOLE)
SET_CONSOLE_3270; SET_CONSOLE_3270;
#elif defined(CONFIG_HWC_CONSOLE) #elif defined(CONFIG_SCLP_CONSOLE)
SET_CONSOLE_HWC; SET_CONSOLE_SCLP;
#endif #endif
} }
} else if (MACHINE_IS_P390) { } else if (MACHINE_IS_P390) {
...@@ -227,8 +227,8 @@ static void __init conmode_default(void) ...@@ -227,8 +227,8 @@ static void __init conmode_default(void)
SET_CONSOLE_3270; SET_CONSOLE_3270;
#endif #endif
} else { } else {
#if defined(CONFIG_HWC_CONSOLE) #if defined(CONFIG_SCLP_CONSOLE)
SET_CONSOLE_HWC; SET_CONSOLE_SCLP;
#endif #endif
} }
} }
......
arch/s390/kernel/smp.c
View file @ 8309fa38
...@@ -274,7 +274,7 @@ void machine_power_off_smp(void) ...@@ -274,7 +274,7 @@ void machine_power_off_smp(void)
void do_ext_call_interrupt(struct pt_regs *regs, __u16 code) void do_ext_call_interrupt(struct pt_regs *regs, __u16 code)
{ {
int bits; unsigned long bits;
/* /*
* handle bit signal external calls * handle bit signal external calls
...@@ -282,9 +282,7 @@ void do_ext_call_interrupt(struct pt_regs *regs, __u16 code) ...@@ -282,9 +282,7 @@ void do_ext_call_interrupt(struct pt_regs *regs, __u16 code)
* For the ec_schedule signal we have to do nothing. All the work * For the ec_schedule signal we have to do nothing. All the work
* is done automatically when we return from the interrupt. * is done automatically when we return from the interrupt.
*/ */
do { bits = xchg(&S390_lowcore.ext_call_fast, 0);
bits = atomic_read(&S390_lowcore.ext_call_fast);
} while (atomic_compare_and_swap(bits,0,&S390_lowcore.ext_call_fast));
if (test_bit(ec_call_function, &bits)) if (test_bit(ec_call_function, &bits))
do_call_function(); do_call_function();
...@@ -296,13 +294,12 @@ void do_ext_call_interrupt(struct pt_regs *regs, __u16 code) ...@@ -296,13 +294,12 @@ void do_ext_call_interrupt(struct pt_regs *regs, __u16 code)
*/ */
static sigp_ccode smp_ext_bitcall(int cpu, ec_bit_sig sig) static sigp_ccode smp_ext_bitcall(int cpu, ec_bit_sig sig)
{ {
struct _lowcore *lowcore = lowcore_ptr[cpu];
sigp_ccode ccode; sigp_ccode ccode;
/* /*
* Set signaling bit in lowcore of target cpu and kick it * Set signaling bit in lowcore of target cpu and kick it
*/ */
atomic_set_mask(1<<sig, &lowcore->ext_call_fast); set_bit(sig, (unsigned long *) &lowcore_ptr[cpu]->ext_call_fast);
ccode = signal_processor(cpu, sigp_external_call); ccode = signal_processor(cpu, sigp_external_call);
return ccode; return ccode;
} }
...@@ -323,7 +320,7 @@ static void smp_ext_bitcall_others(ec_bit_sig sig) ...@@ -323,7 +320,7 @@ static void smp_ext_bitcall_others(ec_bit_sig sig)
/* /*
* Set signaling bit in lowcore of target cpu and kick it * Set signaling bit in lowcore of target cpu and kick it
*/ */
atomic_set_mask(1<<sig, &lowcore->ext_call_fast); set_bit(sig, (unsigned long *) &lowcore_ptr[i]->ext_call_fast);
while (signal_processor(i, sigp_external_call) == sigp_busy) while (signal_processor(i, sigp_external_call) == sigp_busy)
udelay(10); udelay(10);
} }
......
arch/s390/kernel/time.c
View file @ 8309fa38
...@@ -140,7 +140,6 @@ static inline __u32 div64_32(__u64 dividend, __u32 divisor) ...@@ -140,7 +140,6 @@ static inline __u32 div64_32(__u64 dividend, __u32 divisor)
*/ */
static void do_comparator_interrupt(struct pt_regs *regs, __u16 error_code) static void do_comparator_interrupt(struct pt_regs *regs, __u16 error_code)
{ {
int cpu = smp_processor_id();
__u64 tmp; __u64 tmp;
__u32 ticks; __u32 ticks;
......
arch/s390/kernel/traps.c
View file @ 8309fa38
...@@ -72,8 +72,8 @@ extern char _stext, _etext; ...@@ -72,8 +72,8 @@ extern char _stext, _etext;
#ifdef CONFIG_MODULES #ifdef CONFIG_MODULES
extern struct module *module_list; /* FIXME: Accessed without a lock --RR */
extern struct module kernel_module; extern struct list_head modules;
static inline int kernel_text_address(unsigned long addr) static inline int kernel_text_address(unsigned long addr)
{ {
...@@ -84,11 +84,11 @@ static inline int kernel_text_address(unsigned long addr) ...@@ -84,11 +84,11 @@ static inline int kernel_text_address(unsigned long addr)
addr <= (unsigned long) &_etext) addr <= (unsigned long) &_etext)
return 1; return 1;
for (mod = module_list; mod != &kernel_module; mod = mod->next) { list_for_each_entry(mod, &modules, list) {
/* mod_bound tests for addr being inside the vmalloc'ed /* mod_bound tests for addr being inside the vmalloc'ed
* module area. Of course it'd be better to test only * module area. Of course it'd be better to test only
* for the .text subset... */ * for the .text subset... */
if (mod_bound(addr, 0, mod)) { if (mod_bound((void*)addr, 0, mod)) {
retval = 1; retval = 1;
break; break;
} }
......
arch/s390/lib/uaccess.S
View file @ 8309fa38
/* /*
* arch/s390/lib/uaccess.S * arch/s390/lib/uaccess.S
* fixup routines for copy_{from|to}_user functions. * __copy_{from|to}_user functions.
* *
* s390 * s390
* Copyright (C) 2000 IBM Deutschland Entwicklung GmbH, IBM Corporation * Copyright (C) 2000,2002 IBM Deutschland Entwicklung GmbH, IBM Corporation
* Authors(s): Martin Schwidefsky (schwidefsky@de.ibm.com) * Authors(s): Martin Schwidefsky (schwidefsky@de.ibm.com)
* *
* These functions have standard call interface * These functions have standard call interface
...@@ -22,17 +22,23 @@ __copy_from_user_asm: ...@@ -22,17 +22,23 @@ __copy_from_user_asm:
1: sacf 0 1: sacf 0
lr %r2,%r5 lr %r2,%r5
br %r14 br %r14
2: sll %r4,1 2: lhi %r1,-4096
srl %r4,1 lr %r3,%r4
lhi %r3,-4096 slr %r3,%r1 # %r3 = %r4 + 4096
sll %r3,1 nr %r3,%r1 # %r3 = (%r4 + 4096) & -4096
srl %r3,1 slr %r3,%r4 # %r3 = #bytes to next user page boundary
n %r3,__LC_TRANS_EXC_ADDR clr %r5,%r3 # copy crosses next page boundary ?
sr %r3,%r4 jnh 1b # no, this page fauled
jm 1b # The page after the current user page might have faulted.
j 0b # We cant't find out which page because the program check handler
# might have callled schedule, destroying all lowcore information.
# We retry with the shortened length.
3: mvcle %r2,%r4,0
jo 3b
j 1b
.section __ex_table,"a" .section __ex_table,"a"
.long 0b,2b .long 0b,2b
.long 3b,1b
.previous .previous
.align 4 .align 4
...@@ -46,17 +52,23 @@ __copy_to_user_asm: ...@@ -46,17 +52,23 @@ __copy_to_user_asm:
1: sacf 0 1: sacf 0
lr %r2,%r3 lr %r2,%r3
br %r14 br %r14
2: sll %r4,1 2: lhi %r1,-4096
srl %r4,1 lr %r5,%r4
lhi %r5,-4096 slr %r5,%r1 # %r5 = %r4 + 4096
sll %r5,1 nr %r5,%r1 # %r5 = (%r4 + 4096) & -4096
srl %r5,1 slr %r5,%r4 # %r5 = #bytes to next user page boundary
n %r5,__LC_TRANS_EXC_ADDR clr %r3,%r5 # copy crosses next page boundary ?
sr %r5,%r4 jnh 1b # no, the current page fauled
jm 1b # The page after the current user page might have faulted.
j 0b # We cant't find out which page because the program check handler
# might have callled schedule, destroying all lowcore information.
# We retry with the shortened length.
3: mvcle %r4,%r2,0
jo 3b
j 1b
.section __ex_table,"a" .section __ex_table,"a"
.long 0b,2b .long 0b,2b
.long 3b,1b
.previous .previous
.align 4 .align 4
...@@ -71,18 +83,26 @@ __clear_user_asm: ...@@ -71,18 +83,26 @@ __clear_user_asm:
0: mvcle %r4,%r2,0 0: mvcle %r4,%r2,0
jo 0b jo 0b
1: sacf 0 1: sacf 0
lr %r2,%r3
br %r14 br %r14
2: sll %r4,1 2: lr %r2,%r5
srl %r4,1 lhi %r1,-4096
lhi %r5,-4096 slr %r5,%r1 # %r5 = %r4 + 4096
sll %r5,1 nr %r5,%r1 # %r5 = (%r4 + 4096) & -4096
srl %r5,1 slr %r5,%r4 # %r5 = #bytes to next user page boundary
n %r5,__LC_TRANS_EXC_ADDR clr %r2,%r5 # copy crosses next page boundary ?
sr %r5,%r4 jnh 1b # no, the current page fauled
jm 1b # The page after the current user page might have faulted.
j 0b # We cant't find out which page because the program check handler
# might have callled schedule, destroying all lowcore information.
# We retry with the shortened length.
slr %r2,%r5
3: mvcle %r4,%r2,0
jo 3b
j 1b
4: alr %r2,%r5
j 1b
.section __ex_table,"a" .section __ex_table,"a"
.long 0b,2b .long 0b,2b
.long 3b,4b
.previous .previous
arch/s390/mm/extable.c
View file @ 8309fa38
...@@ -42,6 +42,7 @@ extern spinlock_t modlist_lock; ...@@ -42,6 +42,7 @@ extern spinlock_t modlist_lock;
unsigned long unsigned long
search_exception_table(unsigned long addr) search_exception_table(unsigned long addr)
{ {
struct list_head *i;
unsigned long ret = 0; unsigned long ret = 0;
#ifndef CONFIG_MODULES #ifndef CONFIG_MODULES
...@@ -52,16 +53,17 @@ search_exception_table(unsigned long addr) ...@@ -52,16 +53,17 @@ search_exception_table(unsigned long addr)
return ret; return ret;
#else #else
unsigned long flags; unsigned long flags;
/* The kernel is the last "module" -- no need to treat it special. */
struct module *mp;
addr &= 0x7fffffff; /* remove amode bit from address */ addr &= 0x7fffffff; /* remove amode bit from address */
/* The kernel is the last "module" -- no need to treat it special. */
spin_lock_irqsave(&modlist_lock, flags); spin_lock_irqsave(&modlist_lock, flags);
for (mp = module_list; mp != NULL; mp = mp->next) { list_for_each(i, &extables) {
if (mp->ex_table_start == NULL || !(mp->flags&(MOD_RUNNING|MOD_INITIALIZING))) struct exception_table *ex
= list_entry(i, struct exception_table, list);
if (ex->num_entries == 0)
continue; continue;
ret = search_one_table(mp->ex_table_start, ret = search_one_table(ex->entry,
mp->ex_table_end - 1, addr); ex->entry + ex->num_entries - 1, addr);
if (ret) { if (ret) {
ret = ret | PSW_ADDR_AMODE31; ret = ret | PSW_ADDR_AMODE31;
break; break;
......
arch/s390/mm/init.c
View file @ 8309fa38
...@@ -188,7 +188,7 @@ void free_initmem(void) ...@@ -188,7 +188,7 @@ void free_initmem(void)
free_page(addr); free_page(addr);
totalram_pages++; totalram_pages++;
} }
printk ("Freeing unused kernel memory: %dk freed\n", printk ("Freeing unused kernel memory: %ldk freed\n",
((unsigned long)&__init_end - (unsigned long)&__init_begin) >> 10); ((unsigned long)&__init_end - (unsigned long)&__init_begin) >> 10);
} }
......
arch/s390/vmlinux.lds.S
View file @ 8309fa38
...@@ -25,6 +25,7 @@ SECTIONS ...@@ -25,6 +25,7 @@ SECTIONS
__ex_table : { *(__ex_table) } __ex_table : { *(__ex_table) }
__stop___ex_table = .; __stop___ex_table = .;
. = ALIGN(64);
__start___ksymtab = .; /* Kernel symbol table */ __start___ksymtab = .; /* Kernel symbol table */
__ksymtab : { *(__ksymtab) } __ksymtab : { *(__ksymtab) }
__stop___ksymtab = .; __stop___ksymtab = .;
...@@ -40,18 +41,31 @@ SECTIONS ...@@ -40,18 +41,31 @@ SECTIONS
CONSTRUCTORS CONSTRUCTORS
} }
. = ALIGN(4096);
__nosave_begin = .;
.data_nosave : { *(.data.nosave) }
. = ALIGN(4096);
__nosave_end = .;
. = ALIGN(4096);
.data.page_aligned : { *(.data.idt) }
. = ALIGN(32);
.data.cacheline_aligned : { *(.data.cacheline_aligned) }
_edata = .; /* End of data section */ _edata = .; /* End of data section */
. = ALIGN(8192); /* init_task */ . = ALIGN(8192); /* init_task */
.data.init_task : { *(.data.init_task) } .data.init_task : { *(.data.init_task) }
/* will be freed after init */
. = ALIGN(4096); /* Init code and data */ . = ALIGN(4096); /* Init code and data */
__init_begin = .; __init_begin = .;
.text.init : { *(.text.init) } .init.text : { *(.init.text) }
.data.init : { *(.data.init) } .init.data : { *(.init.data) }
. = ALIGN(256); . = ALIGN(256);
__setup_start = .; __setup_start = .;
.setup.init : { *(.setup.init) } .init.setup : { *(.init.setup) }
__setup_end = .; __setup_end = .;
__initcall_start = .; __initcall_start = .;
.initcall.init : { .initcall.init : {
...@@ -65,23 +79,29 @@ SECTIONS ...@@ -65,23 +79,29 @@ SECTIONS
} }
__initcall_end = .; __initcall_end = .;
. = ALIGN(256); . = ALIGN(256);
__initramfs_start = .;
.init.ramfs : { *(.init.initramfs) }
__initramfs_end = .;
. = ALIGN(256);
__per_cpu_start = .; __per_cpu_start = .;
.data.percpu : { *(.data.percpu) } .data.percpu : { *(.data.percpu) }
__per_cpu_end = .; __per_cpu_end = .;
. = ALIGN(4096); . = ALIGN(4096);
__init_end = .; __init_end = .;
/* freed after init ends here */
. = ALIGN(32); __bss_start = .; /* BSS */
.data.cacheline_aligned : { *(.data.cacheline_aligned) } .bss : { *(.bss) }
__bss_stop = .;
. = ALIGN(4096); _end = . ;
.data.page_aligned : { *(.data.idt) }
__bss_start = .; /* BSS */ /* Sections to be discarded */
.bss : { /DISCARD/ : {
*(.bss) *(.exit.text)
*(.exit.data)
*(.exitcall.exit)
} }
_end = . ;
/* Stabs debugging sections. */ /* Stabs debugging sections. */
.stab 0 : { *(.stab) } .stab 0 : { *(.stab) }
......
arch/s390x/Kconfig
View file @ 8309fa38
...@@ -11,38 +11,6 @@ config SWAP ...@@ -11,38 +11,6 @@ config SWAP
bool bool
default y default y
config ISA
bool
help
Find out whether you have ISA slots on your motherboard. ISA is the
name of a bus system, i.e. the way the CPU talks to the other stuff
inside your box. Other bus systems are PCI, EISA, MicroChannel
(MCA) or VESA. ISA is an older system, now being displaced by PCI;
newer boards don't support it. If you have ISA, say Y, otherwise N.
config EISA
bool
---help---
The Extended Industry Standard Architecture (EISA) bus was
developed as an open alternative to the IBM MicroChannel bus.
The EISA bus provided some of the features of the IBM MicroChannel
bus while maintaining backward compatibility with cards made for
the older ISA bus. The EISA bus saw limited use between 1988 and
1995 when it was made obsolete by the PCI bus.
Say Y here if you are building a kernel for an EISA-based machine.
Otherwise, say N.
config MCA
bool
help
MicroChannel Architecture is found in some IBM PS/2 machines and
laptops. It is a bus system similar to PCI or ISA. See
<file:Documentation/mca.txt> (and especially the web page given
there) before attempting to build an MCA bus kernel.
config RWSEM_GENERIC_SPINLOCK config RWSEM_GENERIC_SPINLOCK
bool bool
...@@ -108,6 +76,13 @@ config NR_CPUS ...@@ -108,6 +76,13 @@ config NR_CPUS
int "Maximum number of CPUs (2-64)" int "Maximum number of CPUs (2-64)"
depends on SMP depends on SMP
default "64" default "64"
help
This allows you to specify the maximum number of CPUs which this
kernel will support. The maximum supported value is 64 and the
minimum value which makes sense is 2.
This is purely to save memory - each supported CPU adds
approximately sixteen kilobytes to the kernel image.
config S390_SUPPORT config S390_SUPPORT
bool "Kernel support for 31 bit emulation" bool "Kernel support for 31 bit emulation"
...@@ -161,6 +136,14 @@ comment "Misc" ...@@ -161,6 +136,14 @@ comment "Misc"
config PREEMPT config PREEMPT
bool "Preemptible Kernel" bool "Preemptible Kernel"
help
This option reduces the latency of the kernel when reacting to
real-time or interactive events by allowing a low priority process to
be preempted even if it is in kernel mode executing a system call.
This allows applications to run more reliably even when the system is
under load.
Say N if you are unsure.
config IPL config IPL
bool "Builtin IPL record support" bool "Builtin IPL record support"
......
arch/s390x/Makefile
View file @ 8309fa38
...@@ -16,7 +16,8 @@ ...@@ -16,7 +16,8 @@
LDFLAGS := -m elf64_s390 LDFLAGS := -m elf64_s390
OBJCOPYFLAGS := -O binary OBJCOPYFLAGS := -O binary
LDFLAGS_vmlinux := -e start LDFLAGS_vmlinux := -e start
MODFLAGS += -fpic MODFLAGS += -fpic -D__PIC__
LDFLAGS_BLOB := --format binary --oformat elf64-s390
CFLAGS += -pipe -fno-strength-reduce CFLAGS += -pipe -fno-strength-reduce
...@@ -28,18 +29,14 @@ libs-y += arch/s390x/lib/ ...@@ -28,18 +29,14 @@ libs-y += arch/s390x/lib/
all: image listing all: image listing
listing: vmlinux makeboot = $(call descend,arch/$(ARCH)/boot,$(1))
@$(MAKEBOOT) listing BOOTIMAGE= arch/$(ARCH)/boot/image
MAKEBOOT = $(MAKE) -C arch/$(ARCH)/boot listing install image: vmlinux
+@$(call makeboot,BOOTIMAGE=$(BOOTIMAGE) $@)
image: vmlinux
@$(MAKEBOOT) image
install: vmlinux
@$(MAKEBOOT) BOOTIMAGE=image install
archclean: archclean:
+@$(call makeboot,clean)
archmrproper: archmrproper:
......
arch/s390x/boot/Makefile
View file @ 8309fa38
...@@ -6,22 +6,22 @@ EXTRA_AFLAGS := -traditional ...@@ -6,22 +6,22 @@ EXTRA_AFLAGS := -traditional
include $(TOPDIR)/Rules.make include $(TOPDIR)/Rules.make
%.lnk: %.o quiet_cmd_listing = OBJDUMP $(echo_target)
$(LD) -Ttext 0x0 -o $@ $< cmd_listing = $(OBJDUMP) --disassemble --disassemble-all \
--disassemble-zeroes --reloc vmlinux > $@
%.boot: %.lnk $(obj)/image: vmlinux
$(OBJCOPY) $(OBJCOPYFLAGS) $< $@ $(call if_changed,objcopy)
image: $(TOPDIR)/vmlinux \ $(obj)/listing: vmlinux
iplfba.boot ipleckd.boot ipldump.boot $(call if_changed,listing)
$(OBJCOPY) $(OBJCOPYFLAGS) $< $@
$(NM) $(TOPDIR)/vmlinux | grep -v '\(compiled\)\|\( [aUw] \)\|\(\.\)\|\(LASH[RL]DI\)' | sort > $(TOPDIR)/System.map
listing: ../../../vmlinux image: $(obj)/image
$(OBJDUMP) --disassemble --disassemble-all --disassemble-zeroes --reloc $(TOPDIR)/vmlinux > listing
listing: $(obj)/listing
clean: clean:
rm -f image listing iplfba.boot ipleckd.boot ipldump.boot rm -f $(obj)/image $(obj)/listing
install: $(CONFIGURE) $(BOOTIMAGE) install: $(CONFIGURE) $(BOOTIMAGE)
sh -x ./install.sh $(KERNELRELEASE) $(BOOTIMAGE) $(TOPDIR)/System.map $(TOPDIR)/Kerntypes "$(INSTALL_PATH)" sh -x $(obj)/install.sh $(KERNELRELEASE) $(BOOTIMAGE) System.map Kerntypes "$(INSTALL_PATH)"
arch/s390x/defconfig
View file @ 8309fa38
This diff is collapsed.
arch/s390x/kernel/Makefile
View file @ 8309fa38
...@@ -12,7 +12,7 @@ obj-y := entry.o bitmap.o traps.o time.o process.o \ ...@@ -12,7 +12,7 @@ obj-y := entry.o bitmap.o traps.o time.o process.o \
setup.o sys_s390.o ptrace.o signal.o cpcmd.o ebcdic.o \ setup.o sys_s390.o ptrace.o signal.o cpcmd.o ebcdic.o \
semaphore.o reipl.o s390_ext.o debug.o semaphore.o reipl.o s390_ext.o debug.o
obj-$(CONFIG_MODULES) += s390_ksyms.o obj-$(CONFIG_MODULES) += s390_ksyms.o module.o
obj-$(CONFIG_SMP) += smp.o obj-$(CONFIG_SMP) += smp.o
# #
......
arch/s390x/kernel/entry.S
View file @ 8309fa38
...@@ -503,10 +503,10 @@ sys_call_table: ...@@ -503,10 +503,10 @@ sys_call_table:
.long SYSCALL(sys_adjtimex,sys32_adjtimex_wrapper) .long SYSCALL(sys_adjtimex,sys32_adjtimex_wrapper)
.long SYSCALL(sys_mprotect,sys32_mprotect_wrapper) /* 125 */ .long SYSCALL(sys_mprotect,sys32_mprotect_wrapper) /* 125 */
.long SYSCALL(sys_sigprocmask,sys32_sigprocmask_wrapper) .long SYSCALL(sys_sigprocmask,sys32_sigprocmask_wrapper)
.long SYSCALL(sys_create_module,sys32_create_module_wrapper) .long SYSCALL(sys_ni_syscall,sys_ni_syscall) /* old "create module" */
.long SYSCALL(sys_init_module,sys32_init_module_wrapper) .long SYSCALL(sys_init_module,sys32_init_module_wrapper)
.long SYSCALL(sys_delete_module,sys32_delete_module_wrapper) .long SYSCALL(sys_delete_module,sys32_delete_module_wrapper)
.long SYSCALL(sys_get_kernel_syms,sys32_get_kernel_syms_wrapper) /* 130 */ .long SYSCALL(sys_ni_syscall,sys_ni_syscall) /* 130: old get_kernel_syms */
.long SYSCALL(sys_quotactl,sys32_quotactl_wrapper) .long SYSCALL(sys_quotactl,sys32_quotactl_wrapper)
.long SYSCALL(sys_getpgid,sys32_getpgid_wrapper) .long SYSCALL(sys_getpgid,sys32_getpgid_wrapper)
.long SYSCALL(sys_fchdir,sys32_fchdir_wrapper) .long SYSCALL(sys_fchdir,sys32_fchdir_wrapper)
...@@ -543,7 +543,7 @@ sys_call_table: ...@@ -543,7 +543,7 @@ sys_call_table:
.long SYSCALL(sys_ni_syscall,sys32_setresuid16_wrapper) /* old setresuid16 syscall */ .long SYSCALL(sys_ni_syscall,sys32_setresuid16_wrapper) /* old setresuid16 syscall */
.long SYSCALL(sys_ni_syscall,sys32_getresuid16_wrapper) /* old getresuid16 syscall */ .long SYSCALL(sys_ni_syscall,sys32_getresuid16_wrapper) /* old getresuid16 syscall */
.long SYSCALL(sys_ni_syscall,sys_ni_syscall) /* for vm86 */ .long SYSCALL(sys_ni_syscall,sys_ni_syscall) /* for vm86 */
.long SYSCALL(sys_query_module,sys32_query_module_wrapper) .long SYSCALL(sys_ni_syscall,sys_ni_syscall) /* old sys_query_module */
.long SYSCALL(sys_poll,sys32_poll_wrapper) .long SYSCALL(sys_poll,sys32_poll_wrapper)
.long SYSCALL(sys_nfsservctl,sys32_nfsservctl_wrapper) .long SYSCALL(sys_nfsservctl,sys32_nfsservctl_wrapper)
.long SYSCALL(sys_ni_syscall,sys32_setresgid16_wrapper) /* old setresgid16 syscall */ .long SYSCALL(sys_ni_syscall,sys32_setresgid16_wrapper) /* old setresgid16 syscall */
...@@ -625,7 +625,11 @@ sys_call_table: ...@@ -625,7 +625,11 @@ sys_call_table:
.long SYSCALL(sys_io_submit,sys_ni_syscall) .long SYSCALL(sys_io_submit,sys_ni_syscall)
.long SYSCALL(sys_io_cancel,sys_ni_syscall) .long SYSCALL(sys_io_cancel,sys_ni_syscall)
.long SYSCALL(sys_exit_group,sys32_exit_group_wrapper) .long SYSCALL(sys_exit_group,sys32_exit_group_wrapper)
.rept 255-248 .long SYSCALL(sys_epoll_create,sys_ni_syscall)
.long SYSCALL(sys_epoll_ctl,sys_ni_syscall)
.long SYSCALL(sys_epoll_wait,sys_ni_syscall)
.long SYSCALL(sys_set_tid_address,sys_ni_syscall)
.rept 255-252
.long SYSCALL(sys_ni_syscall,sys_ni_syscall) .long SYSCALL(sys_ni_syscall,sys_ni_syscall)
.endr .endr
......
arch/s390x/kernel/ioctl32.c
View file @ 8309fa38
...@@ -1024,6 +1024,8 @@ int sys32_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg) ...@@ -1024,6 +1024,8 @@ int sys32_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg)
static void ioctl32_insert(struct ioctl32_list *entry) static void ioctl32_insert(struct ioctl32_list *entry)
{ {
int hash = ioctl32_hash(entry->handler.cmd); int hash = ioctl32_hash(entry->handler.cmd);
entry->next = 0;
if (!ioctl32_hash_table[hash]) if (!ioctl32_hash_table[hash])
ioctl32_hash_table[hash] = entry; ioctl32_hash_table[hash] = entry;
else { else {
...@@ -1032,10 +1034,51 @@ static void ioctl32_insert(struct ioctl32_list *entry) ...@@ -1032,10 +1034,51 @@ static void ioctl32_insert(struct ioctl32_list *entry)
while (l->next) while (l->next)
l = l->next; l = l->next;
l->next = entry; l->next = entry;
entry->next = 0;
} }
} }
int register_ioctl32_conversion(unsigned int cmd,
int (*handler)(unsigned int, unsigned int,
unsigned long, struct file *))
{
struct ioctl32_list *l, *new;
int hash;
hash = ioctl32_hash(cmd);
for (l = ioctl32_hash_table[hash]; l != NULL; l = l->next)
if (l->handler.cmd == cmd)
return -EBUSY;
new = kmalloc(sizeof(struct ioctl32_list), GFP_KERNEL);
if (new == NULL)
return -ENOMEM;
new->handler.cmd = cmd;
new->handler.function = (void *) handler;
ioctl32_insert(new);
return 0;
}
int unregister_ioctl32_conversion(unsigned int cmd)
{
struct ioctl32_list *p, *l;
int hash;
hash = ioctl32_hash(cmd);
p = NULL;
for (l = ioctl32_hash_table[hash]; l != NULL; l = l->next) {
if (l->handler.cmd == cmd)
break;
p = l;
}
if (l == NULL)
return -ENOENT;
if (p == NULL)
ioctl32_hash_table[hash] = l->next;
else
p->next = l->next;
kfree(l);
return 0;
}
static int __init init_ioctl32(void) static int __init init_ioctl32(void)
{ {
int i; int i;
......
arch/s390x/kernel/linux32.c
View file @ 8309fa38
This diff is collapsed.
arch/s390x/kernel/module.c 0 → 100644
View file @ 8309fa38
/*
* arch/s390x/kernel/module.c - Kernel module help for s390x.
*
* S390 version
* Copyright (C) 2002 IBM Deutschland Entwicklung GmbH, IBM Corporation
* Author(s): Arnd Bergmann (arndb@de.ibm.com)
* Martin Schwidefsky (schwidefsky@de.ibm.com)
*
* based on i386 version
* Copyright (C) 2001 Rusty Russell.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <linux/module.h>
#include <linux/elf.h>
#include <linux/vmalloc.h>
#include <linux/fs.h>
#include <linux/string.h>
#include <linux/kernel.h>
#if 0
#define DEBUGP printk
#else
#define DEBUGP(fmt , ...)
#endif
void *module_alloc(unsigned long size)
{
if (size == 0)
return NULL;
return vmalloc(size);
}
/* Free memory returned from module_alloc */
void module_free(struct module *mod, void *module_region)
{
vfree(module_region);
/* FIXME: If module_region == mod->init_region, trim exception
table entries. */
}
/* s390/s390x needs additional memory for GOT/PLT sections. */
long module_core_size(const Elf32_Ehdr *hdr,
const Elf32_Shdr *sechdrs,
const char *secstrings,
struct module *module)
{
// FIXME: add space needed for GOT/PLT
return module->core_size;
}
long module_init_size(const Elf32_Ehdr *hdr,
const Elf32_Shdr *sechdrs,
const char *secstrings,
struct module *module)
{
return module->init_size;
}
int apply_relocate(Elf_Shdr *sechdrs,
const char *strtab,
unsigned int symindex,
unsigned int relsec,
struct module *me)
{
unsigned int i;
ElfW(Rel) *rel = (void *)sechdrs[relsec].sh_offset;
ElfW(Sym) *sym;
ElfW(Addr) *location;
DEBUGP("Applying relocate section %u to %u\n", relsec,
sechdrs[relsec].sh_info);
for (i = 0; i < sechdrs[relsec].sh_size / sizeof(*rel); i++) {
/* This is where to make the change */
location = (void *)sechdrs[sechdrs[relsec].sh_info].sh_offset
+ rel[i].r_offset;
/* This is the symbol it is referring to */
sym = (ElfW(Sym) *)sechdrs[symindex].sh_offset
+ ELFW(R_SYM)(rel[i].r_info);
if (!sym->st_value) {
printk(KERN_WARNING "%s: Unknown symbol %s\n",
me->name, strtab + sym->st_name);
return -ENOENT;
}
switch (ELF_R_TYPE(rel[i].r_info)) {
case R_390_8: /* Direct 8 bit. */
*(u8*) location += sym->st_value;
break;
case R_390_12: /* Direct 12 bit. */
*(u16*) location = (*(u16*) location & 0xf000) |
(sym->st_value & 0xfff);
break;
case R_390_16: /* Direct 16 bit. */
*(u16*) location += sym->st_value;
break;
case R_390_32: /* Direct 32 bit. */
*(u32*) location += sym->st_value;
break;
case R_390_64: /* Direct 64 bit. */
*(u64*) location += sym->st_value;
break;
case R_390_PC16: /* PC relative 16 bit. */
*(u16*) location += sym->st_value
- (unsigned long )location;
case R_390_PC16DBL: /* PC relative 16 bit shifted by 1. */
*(u16*) location += (sym->st_value
- (unsigned long )location) >> 1;
case R_390_PC32: /* PC relative 32 bit. */
*(u32*) location += sym->st_value
- (unsigned long )location;
break;
case R_390_PC32DBL: /* PC relative 32 bit shifted by 1. */
*(u32*) location += (sym->st_value
- (unsigned long )location) >> 1;
break;
case R_390_PC64: /* PC relative 64 bit. */
*(u64*) location += sym->st_value
- (unsigned long )location;
break;
case R_390_GOT12: /* 12 bit GOT offset. */
case R_390_GOT16: /* 16 bit GOT offset. */
case R_390_GOT32: /* 32 bit GOT offset. */
case R_390_GOT64: /* 64 bit GOT offset. */
case R_390_GOTENT: /* 32 bit PC rel. to GOT entry >> 1. */
// FIXME: TODO
break;
case R_390_PLT16DBL: /* 16 bit PC rel. PLT shifted by 1. */
case R_390_PLT32: /* 32 bit PC relative PLT address. */
case R_390_PLT32DBL: /* 32 bit PC rel. PLT shifted by 1. */
case R_390_PLT64: /* 64 bit PC relative PLT address. */
// FIXME: TODO
break;
case R_390_GLOB_DAT: /* Create GOT entry. */
case R_390_JMP_SLOT: /* Create PLT entry. */
*location = sym->st_value;
break;
case R_390_RELATIVE: /* Adjust by program base. */
// FIXME: TODO
break;
case R_390_GOTOFF: /* 32 bit offset to GOT. */
// FIXME: TODO
break;
case R_390_GOTPC: /* 32 bit PC relative offset to GOT. */
case R_390_GOTPCDBL: /* 32 bit PC rel. GOT shifted by 1. */
// FIXME: TODO
break;
default:
printk(KERN_ERR "module %s: Unknown relocation: %lu\n",
me->name,
(unsigned long)ELF_R_TYPE(rel[i].r_info));
return -ENOEXEC;
}
}
return 0;
}
int apply_relocate_add(Elf32_Shdr *sechdrs,
const char *strtab,
unsigned int symindex,
unsigned int relsec,
struct module *me)
{
printk(KERN_ERR "module %s: ADD RELOCATION unsupported\n",
me->name);
return -ENOEXEC;
}
int module_finalize(const Elf_Ehdr *hdr,
const Elf_Shdr *sechdrs,
struct module *me)
{
return 0;
}
arch/s390x/kernel/s390_ksyms.c
View file @ 8309fa38
...@@ -60,6 +60,20 @@ EXPORT_SYMBOL(dump_fpu); ...@@ -60,6 +60,20 @@ EXPORT_SYMBOL(dump_fpu);
EXPORT_SYMBOL(overflowuid); EXPORT_SYMBOL(overflowuid);
EXPORT_SYMBOL(overflowgid); EXPORT_SYMBOL(overflowgid);
#ifdef CONFIG_S390_SUPPORT
/*
* Dynamically add/remove 31 bit ioctl conversion functions.
*/
extern int register_ioctl32_conversion(unsigned int cmd,
int (*handler)(unsigned int,
unsigned int,
unsigned long,
struct file *));
int unregister_ioctl32_conversion(unsigned int cmd);
EXPORT_SYMBOL(register_ioctl32_conversion);
EXPORT_SYMBOL(unregister_ioctl32_conversion);
#endif
/* /*
* misc. * misc.
*/ */
......
arch/s390x/kernel/setup.c
View file @ 8309fa38
...@@ -164,9 +164,9 @@ __setup("condev=", condev_setup); ...@@ -164,9 +164,9 @@ __setup("condev=", condev_setup);
static int __init conmode_setup(char *str) static int __init conmode_setup(char *str)
{ {
#if defined(CONFIG_HWC_CONSOLE) #if defined(CONFIG_SCLP_CONSOLE)
if (strncmp(str, "hwc", 4) == 0) if (strncmp(str, "hwc", 4) == 0 || strncmp(str, "sclp", 5) == 0)
SET_CONSOLE_HWC; SET_CONSOLE_SCLP;
#endif #endif
#if defined(CONFIG_TN3215_CONSOLE) #if defined(CONFIG_TN3215_CONSOLE)
if (strncmp(str, "3215", 5) == 0) if (strncmp(str, "3215", 5) == 0)
...@@ -198,8 +198,8 @@ static void __init conmode_default(void) ...@@ -198,8 +198,8 @@ static void __init conmode_default(void)
*/ */
cpcmd("TERM CONMODE 3215", NULL, 0); cpcmd("TERM CONMODE 3215", NULL, 0);
if (ptr == NULL) { if (ptr == NULL) {
#if defined(CONFIG_HWC_CONSOLE) #if defined(CONFIG_SCLP_CONSOLE)
SET_CONSOLE_HWC; SET_CONSOLE_SCLP;
#endif #endif
return; return;
} }
...@@ -208,16 +208,16 @@ static void __init conmode_default(void) ...@@ -208,16 +208,16 @@ static void __init conmode_default(void)
SET_CONSOLE_3270; SET_CONSOLE_3270;
#elif defined(CONFIG_TN3215_CONSOLE) #elif defined(CONFIG_TN3215_CONSOLE)
SET_CONSOLE_3215; SET_CONSOLE_3215;
#elif defined(CONFIG_HWC_CONSOLE) #elif defined(CONFIG_SCLP_CONSOLE)
SET_CONSOLE_HWC; SET_CONSOLE_SCLP;
#endif #endif
} else if (strncmp(ptr + 8, "3215", 4) == 0) { } else if (strncmp(ptr + 8, "3215", 4) == 0) {
#if defined(CONFIG_TN3215_CONSOLE) #if defined(CONFIG_TN3215_CONSOLE)
SET_CONSOLE_3215; SET_CONSOLE_3215;
#elif defined(CONFIG_TN3270_CONSOLE) #elif defined(CONFIG_TN3270_CONSOLE)
SET_CONSOLE_3270; SET_CONSOLE_3270;
#elif defined(CONFIG_HWC_CONSOLE) #elif defined(CONFIG_SCLP_CONSOLE)
SET_CONSOLE_HWC; SET_CONSOLE_SCLP;
#endif #endif
} }
} else if (MACHINE_IS_P390) { } else if (MACHINE_IS_P390) {
...@@ -227,8 +227,8 @@ static void __init conmode_default(void) ...@@ -227,8 +227,8 @@ static void __init conmode_default(void)
SET_CONSOLE_3270; SET_CONSOLE_3270;
#endif #endif
} else { } else {
#if defined(CONFIG_HWC_CONSOLE) #if defined(CONFIG_SCLP_CONSOLE)
SET_CONSOLE_HWC; SET_CONSOLE_SCLP;
#endif #endif
} }
} }
......
arch/s390x/kernel/time.c
View file @ 8309fa38
...@@ -126,7 +126,6 @@ void do_settimeofday(struct timeval *tv) ...@@ -126,7 +126,6 @@ void do_settimeofday(struct timeval *tv)
*/ */
static void do_comparator_interrupt(struct pt_regs *regs, __u16 error_code) static void do_comparator_interrupt(struct pt_regs *regs, __u16 error_code)
{ {
int cpu = smp_processor_id();
__u64 tmp; __u64 tmp;
__u32 ticks; __u32 ticks;
......
arch/s390x/kernel/traps.c
View file @ 8309fa38
...@@ -74,8 +74,8 @@ extern char _stext, _etext; ...@@ -74,8 +74,8 @@ extern char _stext, _etext;
#ifdef CONFIG_MODULES #ifdef CONFIG_MODULES
extern struct module *module_list; /* FIXME: Accessed without a lock --RR */
extern struct module kernel_module; extern struct list_head modules;
static inline int kernel_text_address(unsigned long addr) static inline int kernel_text_address(unsigned long addr)
{ {
...@@ -86,11 +86,11 @@ static inline int kernel_text_address(unsigned long addr) ...@@ -86,11 +86,11 @@ static inline int kernel_text_address(unsigned long addr)
addr <= (unsigned long) &_etext) addr <= (unsigned long) &_etext)
return 1; return 1;
for (mod = module_list; mod != &kernel_module; mod = mod->next) { list_for_each_entry(mod, &modules, list) {
/* mod_bound tests for addr being inside the vmalloc'ed /* mod_bound tests for addr being inside the vmalloc'ed
* module area. Of course it'd be better to test only * module area. Of course it'd be better to test only
* for the .text subset... */ * for the .text subset... */
if (mod_bound(addr, 0, mod)) { if (mod_bound((void*)addr, 0, mod)) {
retval = 1; retval = 1;
break; break;
} }
......
arch/s390x/kernel/wrapper32.S
View file @ 8309fa38
...@@ -17,14 +17,14 @@ sys32_read_wrapper: ...@@ -17,14 +17,14 @@ sys32_read_wrapper:
llgfr %r2,%r2 # unsigned int llgfr %r2,%r2 # unsigned int
llgtr %r3,%r3 # char * llgtr %r3,%r3 # char *
llgfr %r4,%r4 # size_t llgfr %r4,%r4 # size_t
jg sys_read # branch to sys_read jg sys32_read # branch to sys_read
.globl sys32_write_wrapper .globl sys32_write_wrapper
sys32_write_wrapper: sys32_write_wrapper:
llgfr %r2,%r2 # unsigned int llgfr %r2,%r2 # unsigned int
llgtr %r3,%r3 # const char * llgtr %r3,%r3 # const char *
llgfr %r4,%r4 # size_t llgfr %r4,%r4 # size_t
jg sys_write # branch to system call jg sys32_write # branch to system call
.globl sys32_open_wrapper .globl sys32_open_wrapper
sys32_open_wrapper: sys32_open_wrapper:
...@@ -564,12 +564,6 @@ sys32_sigprocmask_wrapper: ...@@ -564,12 +564,6 @@ sys32_sigprocmask_wrapper:
llgtr %r4,%r4 # old_sigset_emu31 * llgtr %r4,%r4 # old_sigset_emu31 *
jg sys32_sigprocmask # branch to system call jg sys32_sigprocmask # branch to system call
.globl sys32_create_module_wrapper
sys32_create_module_wrapper:
llgtr %r2,%r2 # const char *
llgfr %r3,%r3 # size_t
jg sys32_create_module # branch to system call
.globl sys32_init_module_wrapper .globl sys32_init_module_wrapper
sys32_init_module_wrapper: sys32_init_module_wrapper:
llgtr %r2,%r2 # const char * llgtr %r2,%r2 # const char *
...@@ -581,11 +575,6 @@ sys32_delete_module_wrapper: ...@@ -581,11 +575,6 @@ sys32_delete_module_wrapper:
llgtr %r2,%r2 # const char * llgtr %r2,%r2 # const char *
jg sys32_delete_module # branch to system call jg sys32_delete_module # branch to system call
.globl sys32_get_kernel_syms_wrapper
sys32_get_kernel_syms_wrapper:
llgtr %r2,%r2 # struct kernel_sym_emu31 *
jg sys32_get_kernel_syms # branch to system call
.globl sys32_quotactl_wrapper .globl sys32_quotactl_wrapper
sys32_quotactl_wrapper: sys32_quotactl_wrapper:
lgfr %r2,%r2 # int lgfr %r2,%r2 # int
...@@ -786,15 +775,6 @@ sys32_getresuid16_wrapper: ...@@ -786,15 +775,6 @@ sys32_getresuid16_wrapper:
llgtr %r4,%r4 # __kernel_old_uid_emu31_t * llgtr %r4,%r4 # __kernel_old_uid_emu31_t *
jg sys32_getresuid16 # branch to system call jg sys32_getresuid16 # branch to system call
.globl sys32_query_module_wrapper
sys32_query_module_wrapper:
llgtr %r2,%r2 # const char *
lgfr %r3,%r3 # int
llgtr %r4,%r4 # char *
llgfr %r5,%r5 # size_t
llgtr %r6,%r6 # size_t *
jg sys32_query_module # branch to system call
.globl sys32_poll_wrapper .globl sys32_poll_wrapper
sys32_poll_wrapper: sys32_poll_wrapper:
llgtr %r2,%r2 # struct pollfd * llgtr %r2,%r2 # struct pollfd *
......
arch/s390x/lib/uaccess.S
View file @ 8309fa38
/* /*
* arch/s390x/lib/uaccess.S * arch/s390x/lib/uaccess.S
* fixup routines for copy_{from|to}_user functions. * __copy_{from|to}_user functions.
* *
* S390 * s390
* Copyright (C) 2000 IBM Deutschland Entwicklung GmbH, IBM Corporation * Copyright (C) 2000,2002 IBM Deutschland Entwicklung GmbH, IBM Corporation
* Authors(s): Martin Schwidefsky (schwidefsky@de.ibm.com) * Authors(s): Martin Schwidefsky (schwidefsky@de.ibm.com)
* *
* These functions have standard call interface * These functions have standard call interface
...@@ -22,14 +22,23 @@ __copy_from_user_asm: ...@@ -22,14 +22,23 @@ __copy_from_user_asm:
1: sacf 0 1: sacf 0
lgr %r2,%r5 lgr %r2,%r5
br %r14 br %r14
2: lghi %r3,-4096 2: lghi %r1,-4096
ng %r3,__LC_TRANS_EXC_ADDR lgr %r3,%r4
sgr %r3,%r4 slgr %r3,%r1 # %r3 = %r4 + 4096
jm 1b ngr %r3,%r1 # %r3 = (%r4 + 4096) & -4096
j 0b slgr %r3,%r4 # %r3 = #bytes to next user page boundary
clgr %r5,%r3 # copy crosses next page boundary ?
jnh 1b # no, this page fauled
# The page after the current user page might have faulted.
# We cant't find out which page because the program check handler
# might have callled schedule, destroying all lowcore information.
# We retry with the shortened length.
3: mvcle %r2,%r4,0
jo 3b
j 1b
.section __ex_table,"a" .section __ex_table,"a"
.align 8
.quad 0b,2b .quad 0b,2b
.quad 3b,1b
.previous .previous
.align 4 .align 4
...@@ -43,14 +52,23 @@ __copy_to_user_asm: ...@@ -43,14 +52,23 @@ __copy_to_user_asm:
1: sacf 0 1: sacf 0
lgr %r2,%r3 lgr %r2,%r3
br %r14 br %r14
2: lghi %r5,-4096 2: lghi %r1,-4096
ng %r5,__LC_TRANS_EXC_ADDR lgr %r5,%r4
sgr %r5,%r4 slgr %r5,%r1 # %r5 = %r4 + 4096
jm 1b ngr %r5,%r1 # %r5 = (%r4 + 4096) & -4096
j 0b slgr %r5,%r4 # %r5 = #bytes to next user page boundary
clgr %r3,%r5 # copy crosses next page boundary ?
jnh 1b # no, the current page fauled
# The page after the current user page might have faulted.
# We cant't find out which page because the program check handler
# might have callled schedule, destroying all lowcore information.
# We retry with the shortened length.
3: mvcle %r4,%r2,0
jo 3b
j 1b
.section __ex_table,"a" .section __ex_table,"a"
.align 8 .quad 0b,2b
.quad 0b,2b .quad 3b,1b
.previous .previous
.align 4 .align 4
...@@ -65,14 +83,25 @@ __clear_user_asm: ...@@ -65,14 +83,25 @@ __clear_user_asm:
0: mvcle %r4,%r2,0 0: mvcle %r4,%r2,0
jo 0b jo 0b
1: sacf 0 1: sacf 0
lgr %r2,%r5
br %r14 br %r14
2: lghi %r5,-4096 2: lgr %r2,%r5
ng %r5,__LC_TRANS_EXC_ADDR lghi %r1,-4096
sgr %r5,%r4 slgr %r5,%r1 # %r5 = %r4 + 4096
jm 1b ngr %r5,%r1 # %r5 = (%r4 + 4096) & -4096
j 0b slgr %r5,%r4 # %r5 = #bytes to next user page boundary
clgr %r2,%r5 # copy crosses next page boundary ?
jnh 1b # no, the current page fauled
# The page after the current user page might have faulted.
# We cant't find out which page because the program check handler
# might have callled schedule, destroying all lowcore information.
# We retry with the shortened length.
slgr %r2,%r5
3: mvcle %r4,%r2,0
jo 3b
j 1b
4: algr %r2,%r5
j 1b
.section __ex_table,"a" .section __ex_table,"a"
.align 8 .quad 0b,2b
.quad 0b,2b .quad 3b,4b
.previous .previous
arch/s390x/mm/extable.c
View file @ 8309fa38
...@@ -2,10 +2,8 @@ ...@@ -2,10 +2,8 @@
* arch/s390/mm/extable.c * arch/s390/mm/extable.c
* *
* S390 version * S390 version
* Copyright (C) 1999 IBM Deutschland Entwicklung GmbH, IBM Corporation
* Author(s): Hartmut Penner (hp@de.ibm.com)
* *
* Derived from "arch/i386/mm/extable.c" * identical to arch/i386/mm/extable.c
*/ */
#include <linux/config.h> #include <linux/config.h>
...@@ -42,24 +40,27 @@ extern spinlock_t modlist_lock; ...@@ -42,24 +40,27 @@ extern spinlock_t modlist_lock;
unsigned long unsigned long
search_exception_table(unsigned long addr) search_exception_table(unsigned long addr)
{ {
struct list_head *i;
unsigned long ret = 0; unsigned long ret = 0;
#ifndef CONFIG_MODULES #ifndef CONFIG_MODULES
/* There is only the kernel to search. */ /* There is only the kernel to search. */
ret = search_one_table(__start___ex_table, __stop___ex_table-1, addr); ret = search_one_table(__start___ex_table, __stop___ex_table-1, addr);
return ret; return ret;
#else #else
unsigned long flags; unsigned long flags;
/* The kernel is the last "module" -- no need to treat it special. */ struct list_head *i;
struct module *mp;
/* The kernel is the last "module" -- no need to treat it special. */
spin_lock_irqsave(&modlist_lock, flags); spin_lock_irqsave(&modlist_lock, flags);
for (mp = module_list; mp != NULL; mp = mp->next) { list_for_each(i, &extables) {
if (mp->ex_table_start == NULL || !(mp->flags&(MOD_RUNNING|MOD_INITIALIZING))) struct exception_table *ex
= list_entry(i, struct exception_table, list);
if (ex->num_entries == 0)
continue; continue;
ret = search_one_table(mp->ex_table_start, ret = search_one_table(ex->entry,
mp->ex_table_end - 1, addr); ex->entry + ex->num_entries - 1, addr);
if (ret) if (ret)
break; break;
} }
spin_unlock_irqrestore(&modlist_lock, flags); spin_unlock_irqrestore(&modlist_lock, flags);
......
arch/s390x/vmlinux.lds.S
View file @ 8309fa38
/* ld script to make s390 Linux kernel /*
* Written by Martin Schwidefsky (schwidefsky@de.ibm.com) * Written by Martin Schwidefsky (schwidefsky@de.ibm.com)
*/ */
OUTPUT_FORMAT("elf64-s390", "elf64-s390", "elf64-s390") OUTPUT_FORMAT("elf64-s390", "elf64-s390", "elf64-s390")
...@@ -25,6 +25,7 @@ SECTIONS ...@@ -25,6 +25,7 @@ SECTIONS
__ex_table : { *(__ex_table) } __ex_table : { *(__ex_table) }
__stop___ex_table = .; __stop___ex_table = .;
. = ALIGN(64);
__start___ksymtab = .; /* Kernel symbol table */ __start___ksymtab = .; /* Kernel symbol table */
__ksymtab : { *(__ksymtab) } __ksymtab : { *(__ksymtab) }
__stop___ksymtab = .; __stop___ksymtab = .;
...@@ -40,18 +41,31 @@ SECTIONS ...@@ -40,18 +41,31 @@ SECTIONS
CONSTRUCTORS CONSTRUCTORS
} }
. = ALIGN(4096);
__nosave_begin = .;
.data_nosave : { *(.data.nosave) }
. = ALIGN(4096);
__nosave_end = .;
. = ALIGN(4096);
.data.page_aligned : { *(.data.idt) }
. = ALIGN(32);
.data.cacheline_aligned : { *(.data.cacheline_aligned) }
_edata = .; /* End of data section */ _edata = .; /* End of data section */
. = ALIGN(16384); /* init_task */ . = ALIGN(8192); /* init_task */
.data.init_task : { *(.data.init_task) } .data.init_task : { *(.data.init_task) }
/* will be freed after init */
. = ALIGN(4096); /* Init code and data */ . = ALIGN(4096); /* Init code and data */
__init_begin = .; __init_begin = .;
.text.init : { *(.text.init) } .init.text : { *(.init.text) }
.data.init : { *(.data.init) } .init.data : { *(.init.data) }
. = ALIGN(256); . = ALIGN(256);
__setup_start = .; __setup_start = .;
.setup.init : { *(.setup.init) } .init.setup : { *(.init.setup) }
__setup_end = .; __setup_end = .;
__initcall_start = .; __initcall_start = .;
.initcall.init : { .initcall.init : {
...@@ -65,24 +79,29 @@ SECTIONS ...@@ -65,24 +79,29 @@ SECTIONS
} }
__initcall_end = .; __initcall_end = .;
. = ALIGN(256); . = ALIGN(256);
__initramfs_start = .;
.init.ramfs : { *(.init.initramfs) }
__initramfs_end = .;
. = ALIGN(256);
__per_cpu_start = .; __per_cpu_start = .;
.data.percpu : { *(.data.percpu) } .data.percpu : { *(.data.percpu) }
__per_cpu_end = .; __per_cpu_end = .;
. = ALIGN(4096); . = ALIGN(4096);
__init_end = .; __init_end = .;
/* freed after init ends here */
. = ALIGN(32); __bss_start = .; /* BSS */
.data.cacheline_aligned : { *(.data.cacheline_aligned) } .bss : { *(.bss) }
__bss_stop = .;
. = ALIGN(4096);
.data.page_aligned : { *(.data.idt) }
_end = . ;
__bss_start = .; /* BSS */ /* Sections to be discarded */
.bss : { /DISCARD/ : {
*(.bss) *(.exit.text)
*(.exit.data)
*(.exitcall.exit)
} }
_end = . ;
/* Stabs debugging sections. */ /* Stabs debugging sections. */
.stab 0 : { *(.stab) } .stab 0 : { *(.stab) }
......
arch/x86_64/Kconfig
View file @ 8309fa38
...@@ -739,13 +739,13 @@ config INIT_DEBUG ...@@ -739,13 +739,13 @@ config INIT_DEBUG
help help
Fill __init and __initdata at the end of boot. This is only for debugging. Fill __init and __initdata at the end of boot. This is only for debugging.
# config KALLSYMS config KALLSYMS
# bool "Load all symbols for debugging/kksymoops" bool "Load all symbols for debugging/kksymoops"
# depends on DEBUG_KERNEL depends on DEBUG_KERNEL
# help help
# Say Y here to let the kernel print out symbolic crash information and Say Y here to let the kernel print out symbolic crash information and
# symbolic stack backtraces. This increases the size of the kernel symbolic stack backtraces. This increases the size of the kernel
# somewhat, as all symbols have to be loaded into the kernel image. somewhat, as all symbols have to be loaded into the kernel image.
endmenu endmenu
......
drivers/acpi/dispatcher/dsutils.c
View file @ 8309fa38
/******************************************************************************* /*******************************************************************************
* *
* Module Name: dsutils - Dispatcher utilities * Module Name: dsutils - Dispatcher utilities
* $Revision: 96 $ * $Revision: 97 $
* *
******************************************************************************/ ******************************************************************************/
...@@ -274,6 +274,45 @@ acpi_ds_resolve_operands ( ...@@ -274,6 +274,45 @@ acpi_ds_resolve_operands (
return_ACPI_STATUS (status); return_ACPI_STATUS (status);
} }
/*******************************************************************************
*
* FUNCTION: Acpi_ds_clear_operands
*
* PARAMETERS: Walk_state - Current walk state with operands on stack
*
* RETURN: None
*
* DESCRIPTION: Clear all operands on the current walk state operand stack.
*
******************************************************************************/
void
acpi_ds_clear_operands (
acpi_walk_state *walk_state)
{
u32 i;
ACPI_FUNCTION_TRACE_PTR ("Acpi_ds_clear_operands", walk_state);
/*
* Remove a reference on each operand on the stack
*/
for (i = 0; i < walk_state->num_operands; i++) {
/*
* Remove a reference to all operands, including both
* "Arguments" and "Targets".
*/
acpi_ut_remove_reference (walk_state->operands[i]);
walk_state->operands[i] = NULL;
}
walk_state->num_operands = 0;
return_VOID;
}
#endif #endif
......
drivers/acpi/dispatcher/dswexec.c
View file @ 8309fa38
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* *
* Module Name: dswexec - Dispatcher method execution callbacks; * Module Name: dswexec - Dispatcher method execution callbacks;
* dispatch to interpreter. * dispatch to interpreter.
* $Revision: 95 $ * $Revision: 96 $
* *
*****************************************************************************/ *****************************************************************************/
...@@ -329,7 +329,6 @@ acpi_ds_exec_end_op ( ...@@ -329,7 +329,6 @@ acpi_ds_exec_end_op (
u32 op_class; u32 op_class;
acpi_parse_object *next_op; acpi_parse_object *next_op;
acpi_parse_object *first_arg; acpi_parse_object *first_arg;
u32 i;
ACPI_FUNCTION_TRACE_PTR ("Ds_exec_end_op", walk_state); ACPI_FUNCTION_TRACE_PTR ("Ds_exec_end_op", walk_state);
...@@ -406,15 +405,7 @@ acpi_ds_exec_end_op ( ...@@ -406,15 +405,7 @@ acpi_ds_exec_end_op (
/* Always delete the argument objects and clear the operand stack */ /* Always delete the argument objects and clear the operand stack */
for (i = 0; i < walk_state->num_operands; i++) { acpi_ds_clear_operands (walk_state);
/*
* Remove a reference to all operands, including both
* "Arguments" and "Targets".
*/
acpi_ut_remove_reference (walk_state->operands[i]);
walk_state->operands[i] = NULL;
}
walk_state->num_operands = 0;
/* /*
* If a result object was returned from above, push it on the * If a result object was returned from above, push it on the
...@@ -475,6 +466,9 @@ acpi_ds_exec_end_op ( ...@@ -475,6 +466,9 @@ acpi_ds_exec_end_op (
*/ */
status = acpi_ds_resolve_operands (walk_state); status = acpi_ds_resolve_operands (walk_state);
if (ACPI_FAILURE (status)) { if (ACPI_FAILURE (status)) {
/* On error, clear all resolved operands */
acpi_ds_clear_operands (walk_state);
break; break;
} }
......
drivers/acpi/events/evmisc.c
View file @ 8309fa38
/****************************************************************************** /******************************************************************************
* *
* Module Name: evmisc - Miscellaneous event manager support functions * Module Name: evmisc - Miscellaneous event manager support functions
* $Revision: 58 $ * $Revision: 59 $
* *
*****************************************************************************/ *****************************************************************************/
...@@ -228,7 +228,8 @@ acpi_ev_queue_notify_request ( ...@@ -228,7 +228,8 @@ acpi_ev_queue_notify_request (
if (!handler_obj) { if (!handler_obj) {
/* There is no per-device notify handler for this device */ /* There is no per-device notify handler for this device */
ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "No notify handler for node %p \n", node)); ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
"No notify handler for [%4.4s] node %p\n", node->name.ascii, node));
} }
return (status); return (status);
...@@ -466,7 +467,7 @@ acpi_ev_acquire_global_lock ( ...@@ -466,7 +467,7 @@ acpi_ev_acquire_global_lock (
if (acquired) { if (acquired) {
/* We got the lock */ /* We got the lock */
ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "Acquired the HW Global Lock\n")); ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "Acquired the HW Global Lock\n"));
acpi_gbl_global_lock_acquired = TRUE; acpi_gbl_global_lock_acquired = TRUE;
return_ACPI_STATUS (AE_OK); return_ACPI_STATUS (AE_OK);
...@@ -476,7 +477,7 @@ acpi_ev_acquire_global_lock ( ...@@ -476,7 +477,7 @@ acpi_ev_acquire_global_lock (
* Did not get the lock. The pending bit was set above, and we must now * Did not get the lock. The pending bit was set above, and we must now
* wait until we get the global lock released interrupt. * wait until we get the global lock released interrupt.
*/ */
ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "Waiting for the HW Global Lock\n")); ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "Waiting for the HW Global Lock\n"));
/* /*
* Acquire the global lock semaphore first. * Acquire the global lock semaphore first.
......
drivers/acpi/executer/exconvrt.c
View file @ 8309fa38
/****************************************************************************** /******************************************************************************
* *
* Module Name: exconvrt - Object conversion routines * Module Name: exconvrt - Object conversion routines
* $Revision: 41 $ * $Revision: 44 $
* *
*****************************************************************************/ *****************************************************************************/
...@@ -147,10 +147,15 @@ acpi_ex_convert_to_integer ( ...@@ -147,10 +147,15 @@ acpi_ex_convert_to_integer (
return_ACPI_STATUS (AE_NO_MEMORY); return_ACPI_STATUS (AE_NO_MEMORY);
} }
/* Save the Result, delete original descriptor, store new descriptor */ /* Save the Result */
ret_desc->integer.value = result; ret_desc->integer.value = result;
/*
* If we are about to overwrite the original object on the operand stack,
* we must remove a reference on the original object because we are
* essentially removing it from the stack.
*/
if (*result_desc == obj_desc) { if (*result_desc == obj_desc) {
if (walk_state->opcode != AML_STORE_OP) { if (walk_state->opcode != AML_STORE_OP) {
acpi_ut_remove_reference (obj_desc); acpi_ut_remove_reference (obj_desc);
...@@ -191,76 +196,50 @@ acpi_ex_convert_to_buffer ( ...@@ -191,76 +196,50 @@ acpi_ex_convert_to_buffer (
switch (ACPI_GET_OBJECT_TYPE (obj_desc)) { switch (ACPI_GET_OBJECT_TYPE (obj_desc)) {
case ACPI_TYPE_BUFFER:
/* No conversion necessary */
*result_desc = obj_desc;
return_ACPI_STATUS (AE_OK);
case ACPI_TYPE_INTEGER: case ACPI_TYPE_INTEGER:
/* /*
* Create a new Buffer object * Create a new Buffer object.
* Need enough space for one integer
*/ */
ret_desc = acpi_ut_create_internal_object (ACPI_TYPE_BUFFER); ret_desc = acpi_ut_create_buffer_object (acpi_gbl_integer_byte_width);
if (!ret_desc) { if (!ret_desc) {
return_ACPI_STATUS (AE_NO_MEMORY); return_ACPI_STATUS (AE_NO_MEMORY);
} }
/* Need enough space for one integer */
new_buf = ACPI_MEM_CALLOCATE (acpi_gbl_integer_byte_width);
if (!new_buf) {
ACPI_REPORT_ERROR
(("Ex_convert_to_buffer: Buffer allocation failure\n"));
acpi_ut_remove_reference (ret_desc);
return_ACPI_STATUS (AE_NO_MEMORY);
}
/* Copy the integer to the buffer */ /* Copy the integer to the buffer */
new_buf = ret_desc->buffer.pointer;
for (i = 0; i < acpi_gbl_integer_byte_width; i++) { for (i = 0; i < acpi_gbl_integer_byte_width; i++) {
new_buf[i] = (u8) (obj_desc->integer.value >> (i * 8)); new_buf[i] = (u8) (obj_desc->integer.value >> (i * 8));
} }
/* Complete buffer object initialization */
ret_desc->buffer.flags |= AOPOBJ_DATA_VALID;
ret_desc->buffer.pointer = new_buf;
ret_desc->buffer.length = acpi_gbl_integer_byte_width;
/* Return the new buffer descriptor */
*result_desc = ret_desc;
break; break;
case ACPI_TYPE_STRING: case ACPI_TYPE_STRING:
/* /*
* Create a new Buffer object * Create a new Buffer object
* Size will be the string length
*/ */
ret_desc = acpi_ut_create_internal_object (ACPI_TYPE_BUFFER); ret_desc = acpi_ut_create_buffer_object (obj_desc->string.length);
if (!ret_desc) { if (!ret_desc) {
return_ACPI_STATUS (AE_NO_MEMORY); return_ACPI_STATUS (AE_NO_MEMORY);
} }
/* Need enough space for one integer */ /* Copy the string to the buffer */
new_buf = ACPI_MEM_CALLOCATE (obj_desc->string.length); new_buf = ret_desc->buffer.pointer;
if (!new_buf) { ACPI_STRNCPY ((char *) new_buf, (char *) obj_desc->string.pointer,
ACPI_REPORT_ERROR obj_desc->string.length);
(("Ex_convert_to_buffer: Buffer allocation failure\n"));
acpi_ut_remove_reference (ret_desc);
return_ACPI_STATUS (AE_NO_MEMORY);
}
ACPI_STRNCPY ((char *) new_buf, (char *) obj_desc->string.pointer, obj_desc->string.length);
ret_desc->buffer.flags |= AOPOBJ_DATA_VALID;
ret_desc->buffer.pointer = new_buf;
ret_desc->buffer.length = obj_desc->string.length;
/* Return the new buffer descriptor */
*result_desc = ret_desc;
break;
case ACPI_TYPE_BUFFER:
*result_desc = obj_desc;
break; break;
...@@ -270,7 +249,20 @@ acpi_ex_convert_to_buffer ( ...@@ -270,7 +249,20 @@ acpi_ex_convert_to_buffer (
/* Mark buffer initialized */ /* Mark buffer initialized */
(*result_desc)->common.flags |= AOPOBJ_DATA_VALID; ret_desc->common.flags |= AOPOBJ_DATA_VALID;
/*
* If we are about to overwrite the original object on the operand stack,
* we must remove a reference on the original object because we are
* essentially removing it from the stack.
*/
if (*result_desc == obj_desc) {
if (walk_state->opcode != AML_STORE_OP) {
acpi_ut_remove_reference (obj_desc);
}
}
*result_desc = ret_desc;
return_ACPI_STATUS (AE_OK); return_ACPI_STATUS (AE_OK);
} }
...@@ -405,6 +397,19 @@ acpi_ex_convert_to_string ( ...@@ -405,6 +397,19 @@ acpi_ex_convert_to_string (
switch (ACPI_GET_OBJECT_TYPE (obj_desc)) { switch (ACPI_GET_OBJECT_TYPE (obj_desc)) {
case ACPI_TYPE_STRING:
if (max_length >= obj_desc->string.length) {
*result_desc = obj_desc;
return_ACPI_STATUS (AE_OK);
}
else {
/* Must copy the string first and then truncate it */
return_ACPI_STATUS (AE_NOT_IMPLEMENTED);
}
case ACPI_TYPE_INTEGER: case ACPI_TYPE_INTEGER:
string_length = acpi_gbl_integer_byte_width * 2; string_length = acpi_gbl_integer_byte_width * 2;
...@@ -446,16 +451,6 @@ acpi_ex_convert_to_string ( ...@@ -446,16 +451,6 @@ acpi_ex_convert_to_string (
} }
ret_desc->buffer.pointer = new_buf; ret_desc->buffer.pointer = new_buf;
/* Return the new buffer descriptor */
if (*result_desc == obj_desc) {
if (walk_state->opcode != AML_STORE_OP) {
acpi_ut_remove_reference (obj_desc);
}
}
*result_desc = ret_desc;
break; break;
...@@ -511,37 +506,26 @@ acpi_ex_convert_to_string ( ...@@ -511,37 +506,26 @@ acpi_ex_convert_to_string (
new_buf [index-1] = 0; new_buf [index-1] = 0;
ret_desc->buffer.pointer = new_buf; ret_desc->buffer.pointer = new_buf;
ret_desc->string.length = (u32) ACPI_STRLEN ((char *) new_buf); ret_desc->string.length = (u32) ACPI_STRLEN ((char *) new_buf);
/* Return the new buffer descriptor */
if (*result_desc == obj_desc) {
if (walk_state->opcode != AML_STORE_OP) {
acpi_ut_remove_reference (obj_desc);
}
}
*result_desc = ret_desc;
break; break;
case ACPI_TYPE_STRING: default:
return_ACPI_STATUS (AE_TYPE);
if (max_length >= obj_desc->string.length) { }
*result_desc = obj_desc;
}
else {
/* Must copy the string first and then truncate it */
return_ACPI_STATUS (AE_NOT_IMPLEMENTED); /*
* If we are about to overwrite the original object on the operand stack,
* we must remove a reference on the original object because we are
* essentially removing it from the stack.
*/
if (*result_desc == obj_desc) {
if (walk_state->opcode != AML_STORE_OP) {
acpi_ut_remove_reference (obj_desc);
} }
break;
default:
return_ACPI_STATUS (AE_TYPE);
} }
*result_desc = ret_desc;
return_ACPI_STATUS (AE_OK); return_ACPI_STATUS (AE_OK);
} }
......
drivers/acpi/executer/exfield.c
View file @ 8309fa38
/****************************************************************************** /******************************************************************************
* *
* Module Name: exfield - ACPI AML (p-code) execution - field manipulation * Module Name: exfield - ACPI AML (p-code) execution - field manipulation
* $Revision: 113 $ * $Revision: 115 $
* *
*****************************************************************************/ *****************************************************************************/
...@@ -27,8 +27,6 @@ ...@@ -27,8 +27,6 @@
#include "acpi.h" #include "acpi.h"
#include "acdispat.h" #include "acdispat.h"
#include "acinterp.h" #include "acinterp.h"
#include "acevents.h"
#include "amlcode.h"
#define _COMPONENT ACPI_EXECUTER #define _COMPONENT ACPI_EXECUTER
...@@ -90,25 +88,11 @@ acpi_ex_read_data_from_field ( ...@@ -90,25 +88,11 @@ acpi_ex_read_data_from_field (
* This is an SMBus read. We must create a buffer to hold the data * This is an SMBus read. We must create a buffer to hold the data
* and directly access the region handler. * and directly access the region handler.
*/ */
buffer_desc = acpi_ut_create_internal_object (ACPI_TYPE_BUFFER); buffer_desc = acpi_ut_create_buffer_object (ACPI_SMBUS_BUFFER_SIZE);
if (!buffer_desc) { if (!buffer_desc) {
return_ACPI_STATUS (AE_NO_MEMORY); return_ACPI_STATUS (AE_NO_MEMORY);
} }
/* Create the actual read buffer */
buffer_desc->buffer.pointer = ACPI_MEM_CALLOCATE (ACPI_SMBUS_BUFFER_SIZE);
if (!buffer_desc->buffer.pointer) {
acpi_ut_remove_reference (buffer_desc);
return_ACPI_STATUS (AE_NO_MEMORY);
}
/* Complete the buffer object initialization */
buffer_desc->common.flags = AOPOBJ_DATA_VALID;
buffer_desc->buffer.length = ACPI_SMBUS_BUFFER_SIZE;
buffer = buffer_desc->buffer.pointer;
/* Lock entire transaction if requested */ /* Lock entire transaction if requested */
locked = acpi_ex_acquire_global_lock (obj_desc->common_field.field_flags); locked = acpi_ex_acquire_global_lock (obj_desc->common_field.field_flags);
...@@ -118,7 +102,7 @@ acpi_ex_read_data_from_field ( ...@@ -118,7 +102,7 @@ acpi_ex_read_data_from_field (
* Note: Smbus protocol value is passed in upper 16-bits of Function * Note: Smbus protocol value is passed in upper 16-bits of Function
*/ */
status = acpi_ex_access_region (obj_desc, 0, status = acpi_ex_access_region (obj_desc, 0,
(acpi_integer *) buffer_desc->buffer.pointer, ACPI_CAST_PTR (acpi_integer, buffer_desc->buffer.pointer),
ACPI_READ | (obj_desc->field.attribute << 16)); ACPI_READ | (obj_desc->field.attribute << 16));
acpi_ex_release_global_lock (locked); acpi_ex_release_global_lock (locked);
goto exit; goto exit;
...@@ -138,23 +122,10 @@ acpi_ex_read_data_from_field ( ...@@ -138,23 +122,10 @@ acpi_ex_read_data_from_field (
if (length > acpi_gbl_integer_byte_width) { if (length > acpi_gbl_integer_byte_width) {
/* Field is too large for an Integer, create a Buffer instead */ /* Field is too large for an Integer, create a Buffer instead */
buffer_desc = acpi_ut_create_internal_object (ACPI_TYPE_BUFFER); buffer_desc = acpi_ut_create_buffer_object (length);
if (!buffer_desc) { if (!buffer_desc) {
return_ACPI_STATUS (AE_NO_MEMORY); return_ACPI_STATUS (AE_NO_MEMORY);
} }
/* Create the actual read buffer */
buffer_desc->buffer.pointer = ACPI_MEM_CALLOCATE (length);
if (!buffer_desc->buffer.pointer) {
acpi_ut_remove_reference (buffer_desc);
return_ACPI_STATUS (AE_NO_MEMORY);
}
/* Complete the buffer object initialization */
buffer_desc->common.flags = AOPOBJ_DATA_VALID;
buffer_desc->buffer.length = length;
buffer = buffer_desc->buffer.pointer; buffer = buffer_desc->buffer.pointer;
} }
else { else {
...@@ -270,26 +241,12 @@ acpi_ex_write_data_to_field ( ...@@ -270,26 +241,12 @@ acpi_ex_write_data_to_field (
return_ACPI_STATUS (AE_AML_BUFFER_LIMIT); return_ACPI_STATUS (AE_AML_BUFFER_LIMIT);
} }
buffer_desc = acpi_ut_create_internal_object (ACPI_TYPE_BUFFER); buffer_desc = acpi_ut_create_buffer_object (ACPI_SMBUS_BUFFER_SIZE);
if (!buffer_desc) { if (!buffer_desc) {
return_ACPI_STATUS (AE_NO_MEMORY); return_ACPI_STATUS (AE_NO_MEMORY);
} }
/* Create the actual read buffer */
buffer_desc->buffer.pointer = ACPI_MEM_CALLOCATE (ACPI_SMBUS_BUFFER_SIZE);
if (!buffer_desc->buffer.pointer) {
acpi_ut_remove_reference (buffer_desc);
return_ACPI_STATUS (AE_NO_MEMORY);
}
/* Complete the buffer object initialization */
buffer_desc->common.flags = AOPOBJ_DATA_VALID;
buffer_desc->buffer.length = ACPI_SMBUS_BUFFER_SIZE;
buffer = buffer_desc->buffer.pointer; buffer = buffer_desc->buffer.pointer;
ACPI_MEMCPY (buffer, source_desc->buffer.pointer, ACPI_SMBUS_BUFFER_SIZE); ACPI_MEMCPY (buffer, source_desc->buffer.pointer, ACPI_SMBUS_BUFFER_SIZE);
/* Lock entire transaction if requested */ /* Lock entire transaction if requested */
......
drivers/acpi/executer/exmisc.c
View file @ 8309fa38
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
/****************************************************************************** /******************************************************************************
* *
* Module Name: exmisc - ACPI AML (p-code) execution - specific opcodes * Module Name: exmisc - ACPI AML (p-code) execution - specific opcodes
* $Revision: 110 $ * $Revision: 112 $
* *
*****************************************************************************/ *****************************************************************************/
...@@ -148,9 +148,8 @@ acpi_ex_concat_template ( ...@@ -148,9 +148,8 @@ acpi_ex_concat_template (
acpi_operand_object **actual_return_desc, acpi_operand_object **actual_return_desc,
acpi_walk_state *walk_state) acpi_walk_state *walk_state)
{ {
acpi_status status;
acpi_operand_object *return_desc; acpi_operand_object *return_desc;
NATIVE_CHAR *new_buf; u8 *new_buf;
u8 *end_tag1; u8 *end_tag1;
u8 *end_tag2; u8 *end_tag2;
ACPI_SIZE length1; ACPI_SIZE length1;
...@@ -168,54 +167,35 @@ acpi_ex_concat_template ( ...@@ -168,54 +167,35 @@ acpi_ex_concat_template (
return_ACPI_STATUS (AE_AML_OPERAND_TYPE); return_ACPI_STATUS (AE_AML_OPERAND_TYPE);
} }
/* Create a new buffer object for the result */ /* Compute the length of each part */
return_desc = acpi_ut_create_internal_object (ACPI_TYPE_BUFFER);
if (!return_desc) {
return_ACPI_STATUS (AE_NO_MEMORY);
}
/* Allocate a new buffer for the result */
length1 = ACPI_PTR_DIFF (end_tag1, obj_desc1->buffer.pointer); length1 = ACPI_PTR_DIFF (end_tag1, obj_desc1->buffer.pointer);
length2 = ACPI_PTR_DIFF (end_tag2, obj_desc2->buffer.pointer) + length2 = ACPI_PTR_DIFF (end_tag2, obj_desc2->buffer.pointer) +
2; /* Size of END_TAG */ 2; /* Size of END_TAG */
new_buf = ACPI_MEM_ALLOCATE (length1 + length2); /* Create a new buffer object for the result */
if (!new_buf) {
ACPI_REPORT_ERROR return_desc = acpi_ut_create_buffer_object (length1 + length2);
(("Ex_concat_template: Buffer allocation failure\n")); if (!return_desc) {
status = AE_NO_MEMORY; return_ACPI_STATUS (AE_NO_MEMORY);
goto cleanup;
} }
/* Copy the templates to the new descriptor */ /* Copy the templates to the new descriptor */
new_buf = return_desc->buffer.pointer;
ACPI_MEMCPY (new_buf, obj_desc1->buffer.pointer, length1); ACPI_MEMCPY (new_buf, obj_desc1->buffer.pointer, length1);
ACPI_MEMCPY (new_buf + length1, obj_desc2->buffer.pointer, length2); ACPI_MEMCPY (new_buf + length1, obj_desc2->buffer.pointer, length2);
/* Complete the buffer object initialization */
return_desc->common.flags = AOPOBJ_DATA_VALID;
return_desc->buffer.pointer = (u8 *) new_buf;
return_desc->buffer.length = (u32) (length1 + length2);
/* Compute the new checksum */ /* Compute the new checksum */
new_buf[return_desc->buffer.length - 1] = (NATIVE_CHAR) new_buf[return_desc->buffer.length - 1] =
acpi_ut_generate_checksum (return_desc->buffer.pointer, acpi_ut_generate_checksum (return_desc->buffer.pointer,
(return_desc->buffer.length - 1)); (return_desc->buffer.length - 1));
/* Return the completed template descriptor */ /* Return the completed template descriptor */
*actual_return_desc = return_desc; *actual_return_desc = return_desc;
return_ACPI_STATUS (AE_OK); return_ACPI_STATUS (AE_OK);
cleanup:
acpi_ut_remove_reference (return_desc);
return_ACPI_STATUS (status);
} }
...@@ -262,22 +242,14 @@ acpi_ex_do_concatenate ( ...@@ -262,22 +242,14 @@ acpi_ex_do_concatenate (
case ACPI_TYPE_INTEGER: case ACPI_TYPE_INTEGER:
/* Result of two Integers is a Buffer */ /* Result of two Integers is a Buffer */
/* Need enough buffer space for two integers */
return_desc = acpi_ut_create_internal_object (ACPI_TYPE_BUFFER); return_desc = acpi_ut_create_buffer_object (acpi_gbl_integer_byte_width * 2);
if (!return_desc) { if (!return_desc) {
return (AE_NO_MEMORY); return (AE_NO_MEMORY);
} }
/* Need enough buffer space for two integers */ new_buf = (NATIVE_CHAR *) return_desc->buffer.pointer;
return_desc->buffer.length = acpi_gbl_integer_byte_width * 2;
new_buf = ACPI_MEM_CALLOCATE (return_desc->buffer.length);
if (!new_buf) {
ACPI_REPORT_ERROR
(("Ex_do_concatenate: Buffer allocation failure\n"));
status = AE_NO_MEMORY;
goto cleanup;
}
/* Convert the first integer */ /* Convert the first integer */
...@@ -295,10 +267,6 @@ acpi_ex_do_concatenate ( ...@@ -295,10 +267,6 @@ acpi_ex_do_concatenate (
this_integer >>= 8; this_integer >>= 8;
} }
/* Complete the buffer object initialization */
return_desc->common.flags = AOPOBJ_DATA_VALID;
return_desc->buffer.pointer = (u8 *) new_buf;
break; break;
...@@ -340,19 +308,14 @@ acpi_ex_do_concatenate ( ...@@ -340,19 +308,14 @@ acpi_ex_do_concatenate (
/* Result of two Buffers is a Buffer */ /* Result of two Buffers is a Buffer */
return_desc = acpi_ut_create_internal_object (ACPI_TYPE_BUFFER); return_desc = acpi_ut_create_buffer_object (
(ACPI_SIZE) obj_desc1->buffer.length +
(ACPI_SIZE) obj_desc2->buffer.length);
if (!return_desc) { if (!return_desc) {
return (AE_NO_MEMORY); return (AE_NO_MEMORY);
} }
new_buf = ACPI_MEM_ALLOCATE ((ACPI_SIZE) obj_desc1->buffer.length + new_buf = (NATIVE_CHAR *) return_desc->buffer.pointer;
(ACPI_SIZE) obj_desc2->buffer.length);
if (!new_buf) {
ACPI_REPORT_ERROR
(("Ex_do_concatenate: Buffer allocation failure\n"));
status = AE_NO_MEMORY;
goto cleanup;
}
/* Concatenate the buffers */ /* Concatenate the buffers */
...@@ -361,12 +324,6 @@ acpi_ex_do_concatenate ( ...@@ -361,12 +324,6 @@ acpi_ex_do_concatenate (
ACPI_MEMCPY (new_buf + obj_desc1->buffer.length, obj_desc2->buffer.pointer, ACPI_MEMCPY (new_buf + obj_desc1->buffer.length, obj_desc2->buffer.pointer,
obj_desc2->buffer.length); obj_desc2->buffer.length);
/* Complete the buffer object initialization */
return_desc->common.flags = AOPOBJ_DATA_VALID;
return_desc->buffer.pointer = (u8 *) new_buf;
return_desc->buffer.length = obj_desc1->buffer.length +
obj_desc2->buffer.length;
break; break;
......
drivers/acpi/executer/exoparg1.c
View file @ 8309fa38
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
/****************************************************************************** /******************************************************************************
* *
* Module Name: exoparg1 - AML execution - opcodes with 1 argument * Module Name: exoparg1 - AML execution - opcodes with 1 argument
* $Revision: 145 $ * $Revision: 146 $
* *
*****************************************************************************/ *****************************************************************************/
...@@ -345,12 +345,6 @@ acpi_ex_opcode_1A_1T_1R ( ...@@ -345,12 +345,6 @@ acpi_ex_opcode_1A_1T_1R (
* return FALSE * return FALSE
*/ */
return_desc->integer.value = 0; return_desc->integer.value = 0;
/*
* Must delete the result descriptor since there is no reference
* being returned
*/
acpi_ut_remove_reference (operand[1]);
goto cleanup; goto cleanup;
} }
...@@ -389,6 +383,8 @@ acpi_ex_opcode_1A_1T_1R ( ...@@ -389,6 +383,8 @@ acpi_ex_opcode_1A_1T_1R (
return_ACPI_STATUS (status); return_ACPI_STATUS (status);
} }
/* It is possible that the Store already produced a return object */
if (!walk_state->result_obj) { if (!walk_state->result_obj) {
/* /*
* Normally, we would remove a reference on the Operand[0] parameter; * Normally, we would remove a reference on the Operand[0] parameter;
......
drivers/acpi/executer/exoparg2.c
View file @ 8309fa38
/****************************************************************************** /******************************************************************************
* *
* Module Name: exoparg2 - AML execution - opcodes with 2 arguments * Module Name: exoparg2 - AML execution - opcodes with 2 arguments
* $Revision: 114 $ * $Revision: 115 $
* *
*****************************************************************************/ *****************************************************************************/
...@@ -414,39 +414,10 @@ acpi_ex_opcode_2A_1T_1R ( ...@@ -414,39 +414,10 @@ acpi_ex_opcode_2A_1T_1R (
goto cleanup; goto cleanup;
} }
if ((ACPI_GET_OBJECT_TYPE (operand[2]) == ACPI_TYPE_INTEGER) &&
(operand[2]->common.flags & AOPOBJ_AML_CONSTANT)) {
/*
* There is no actual result descriptor (the Zero_op/Constant Result
* descriptor is a placeholder), so just delete the placeholder and
* return a reference to the package element
*/
acpi_ut_remove_reference (operand[2]);
}
else {
/*
* Each element of the package is an internal object. Get the one
* we are after.
*/
temp_desc = operand[0]->package.elements [index];
return_desc->reference.opcode = AML_INDEX_OP;
return_desc->reference.target_type = ACPI_GET_OBJECT_TYPE (temp_desc);
return_desc->reference.object = temp_desc;
status = acpi_ex_store (return_desc, operand[2], walk_state);
return_desc->reference.object = NULL;
}
/*
* The local return object must always be a reference to the package element,
* not the element itself.
*/
return_desc->reference.opcode = AML_INDEX_OP;
return_desc->reference.target_type = ACPI_TYPE_PACKAGE; return_desc->reference.target_type = ACPI_TYPE_PACKAGE;
return_desc->reference.object = operand[0]->package.elements [index];
return_desc->reference.where = &operand[0]->package.elements [index]; return_desc->reference.where = &operand[0]->package.elements [index];
} }
else { else {
/* Object to be indexed is a Buffer */ /* Object to be indexed is a Buffer */
...@@ -457,14 +428,21 @@ acpi_ex_opcode_2A_1T_1R ( ...@@ -457,14 +428,21 @@ acpi_ex_opcode_2A_1T_1R (
goto cleanup; goto cleanup;
} }
return_desc->reference.opcode = AML_INDEX_OP;
return_desc->reference.target_type = ACPI_TYPE_BUFFER_FIELD; return_desc->reference.target_type = ACPI_TYPE_BUFFER_FIELD;
return_desc->reference.object = operand[0]; return_desc->reference.object = operand[0];
return_desc->reference.offset = index;
status = acpi_ex_store (return_desc, operand[2], walk_state);
} }
/* Complete the Index reference object */
return_desc->reference.opcode = AML_INDEX_OP;
return_desc->reference.offset = index;
/* Store the reference to the Target */
status = acpi_ex_store (return_desc, operand[2], walk_state);
/* Return the reference */
walk_state->result_obj = return_desc; walk_state->result_obj = return_desc;
goto cleanup; goto cleanup;
......
drivers/acpi/executer/exresnte.c
View file @ 8309fa38
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
/****************************************************************************** /******************************************************************************
* *
* Module Name: exresnte - AML Interpreter object resolution * Module Name: exresnte - AML Interpreter object resolution
* $Revision: 60 $ * $Revision: 61 $
* *
*****************************************************************************/ *****************************************************************************/
...@@ -85,8 +85,8 @@ acpi_ex_resolve_node_to_value ( ...@@ -85,8 +85,8 @@ acpi_ex_resolve_node_to_value (
source_desc = acpi_ns_get_attached_object (node); source_desc = acpi_ns_get_attached_object (node);
entry_type = acpi_ns_get_type ((acpi_handle) node); entry_type = acpi_ns_get_type ((acpi_handle) node);
ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "Entry=%p Source_desc=%p Type=%X\n", ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "Entry=%p Source_desc=%p [%s]\n",
node, source_desc, entry_type)); node, source_desc, acpi_ut_get_type_name (entry_type)));
if (entry_type == ACPI_TYPE_LOCAL_ALIAS) { if (entry_type == ACPI_TYPE_LOCAL_ALIAS) {
/* There is always exactly one level of indirection */ /* There is always exactly one level of indirection */
......
drivers/acpi/executer/exresop.c
View file @ 8309fa38
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
/****************************************************************************** /******************************************************************************
* *
* Module Name: exresop - AML Interpreter operand/object resolution * Module Name: exresop - AML Interpreter operand/object resolution
* $Revision: 59 $ * $Revision: 60 $
* *
*****************************************************************************/ *****************************************************************************/
...@@ -390,14 +390,6 @@ acpi_ex_resolve_operands ( ...@@ -390,14 +390,6 @@ acpi_ex_resolve_operands (
return_ACPI_STATUS (status); return_ACPI_STATUS (status);
} }
if (obj_desc != *stack_ptr) {
/*
* We just created a new object, remove a reference
* on the original operand object
*/
acpi_ut_remove_reference (obj_desc);
}
goto next_operand; goto next_operand;
...@@ -420,14 +412,6 @@ acpi_ex_resolve_operands ( ...@@ -420,14 +412,6 @@ acpi_ex_resolve_operands (
return_ACPI_STATUS (status); return_ACPI_STATUS (status);
} }
if (obj_desc != *stack_ptr) {
/*
* We just created a new object, remove a reference
* on the original operand object
*/
acpi_ut_remove_reference (obj_desc);
}
goto next_operand; goto next_operand;
...@@ -450,14 +434,6 @@ acpi_ex_resolve_operands ( ...@@ -450,14 +434,6 @@ acpi_ex_resolve_operands (
return_ACPI_STATUS (status); return_ACPI_STATUS (status);
} }
if (obj_desc != *stack_ptr) {
/*
* We just created a new object, remove a reference
* on the original operand object
*/
acpi_ut_remove_reference (obj_desc);
}
goto next_operand; goto next_operand;
......
drivers/acpi/include/acconfig.h
View file @ 8309fa38
/****************************************************************************** /******************************************************************************
* *
* Name: acconfig.h - Global configuration constants * Name: acconfig.h - Global configuration constants
* $Revision: 117 $ * $Revision: 118 $
* *
*****************************************************************************/ *****************************************************************************/
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
/* Version string */ /* Version string */
#define ACPI_CA_VERSION 0x20021111 #define ACPI_CA_VERSION 0x20021115
/* Version of ACPI supported */ /* Version of ACPI supported */
......
drivers/acpi/include/acdispat.h
View file @ 8309fa38
/****************************************************************************** /******************************************************************************
* *
* Name: acdispat.h - dispatcher (parser to interpreter interface) * Name: acdispat.h - dispatcher (parser to interpreter interface)
* $Revision: 54 $ * $Revision: 55 $
* *
*****************************************************************************/ *****************************************************************************/
...@@ -378,6 +378,10 @@ acpi_status ...@@ -378,6 +378,10 @@ acpi_status
acpi_ds_resolve_operands ( acpi_ds_resolve_operands (
acpi_walk_state *walk_state); acpi_walk_state *walk_state);
void
acpi_ds_clear_operands (
acpi_walk_state *walk_state);
/* /*
* dswscope - Scope Stack manipulation * dswscope - Scope Stack manipulation
......
drivers/acpi/include/acutils.h
View file @ 8309fa38
/****************************************************************************** /******************************************************************************
* *
* Name: acutils.h -- prototypes for the common (subsystem-wide) procedures * Name: acutils.h -- prototypes for the common (subsystem-wide) procedures
* $Revision: 147 $ * $Revision: 148 $
* *
*****************************************************************************/ *****************************************************************************/
...@@ -531,6 +531,10 @@ u8 ...@@ -531,6 +531,10 @@ u8
acpi_ut_valid_internal_object ( acpi_ut_valid_internal_object (
void *object); void *object);
acpi_operand_object *
acpi_ut_create_buffer_object (
ACPI_SIZE buffer_size);
/* /*
* Ut_ref_cnt - Object reference count management * Ut_ref_cnt - Object reference count management
......
drivers/acpi/namespace/nseval.c
View file @ 8309fa38
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* *
* Module Name: nseval - Object evaluation interfaces -- includes control * Module Name: nseval - Object evaluation interfaces -- includes control
* method lookup and execution. * method lookup and execution.
* $Revision: 118 $ * $Revision: 119 $
* *
******************************************************************************/ ******************************************************************************/
...@@ -383,7 +383,7 @@ acpi_ns_execute_control_method ( ...@@ -383,7 +383,7 @@ acpi_ns_execute_control_method (
return_ACPI_STATUS (AE_NULL_OBJECT); return_ACPI_STATUS (AE_NULL_OBJECT);
} }
ACPI_DUMP_PATHNAME (method_node, "Ns_execute_control_method: Executing", ACPI_DUMP_PATHNAME (method_node, "Execute Method:",
ACPI_LV_INFO, _COMPONENT); ACPI_LV_INFO, _COMPONENT);
ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "Method at AML address %p Length %X\n", ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "Method at AML address %p Length %X\n",
......
drivers/acpi/namespace/nsinit.c
View file @ 8309fa38
/****************************************************************************** /******************************************************************************
* *
* Module Name: nsinit - namespace initialization * Module Name: nsinit - namespace initialization
* $Revision: 49 $ * $Revision: 50 $
* *
*****************************************************************************/ *****************************************************************************/
...@@ -317,7 +317,7 @@ acpi_ns_init_one_device ( ...@@ -317,7 +317,7 @@ acpi_ns_init_one_device (
ACPI_FUNCTION_TRACE ("Ns_init_one_device"); ACPI_FUNCTION_TRACE ("Ns_init_one_device");
if (!(acpi_dbg_level & ACPI_LV_INIT)) { if ((acpi_dbg_level <= ACPI_LV_ALL_EXCEPTIONS) && (!(acpi_dbg_level & ACPI_LV_INFO))) {
ACPI_DEBUG_PRINT_RAW ((ACPI_DB_OK, ".")); ACPI_DEBUG_PRINT_RAW ((ACPI_DB_OK, "."));
} }
......
drivers/acpi/osl.c
View file @ 8309fa38
...@@ -525,7 +525,7 @@ acpi_os_queue_exec ( ...@@ -525,7 +525,7 @@ acpi_os_queue_exec (
if (!dpc || !dpc->function) if (!dpc || !dpc->function)
return_ACPI_STATUS (AE_BAD_PARAMETER); return_ACPI_STATUS (AE_BAD_PARAMETER);
ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "Executing function [%p(%p)].\n", dpc->function, dpc->context)); ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "Executing function [%p(%p)].\n", dpc->function, dpc->context));
dpc->function(dpc->context); dpc->function(dpc->context);
...@@ -549,7 +549,7 @@ acpi_os_schedule_exec ( ...@@ -549,7 +549,7 @@ acpi_os_schedule_exec (
return_VOID; return_VOID;
} }
ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "Creating new thread to run function [%p(%p)].\n", dpc->function, dpc->context)); ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "Creating new thread to run function [%p(%p)].\n", dpc->function, dpc->context));
thread_pid = kernel_thread(acpi_os_queue_exec, dpc, thread_pid = kernel_thread(acpi_os_queue_exec, dpc,
(CLONE_FS | CLONE_FILES | SIGCHLD)); (CLONE_FS | CLONE_FILES | SIGCHLD));
...@@ -571,7 +571,7 @@ acpi_os_queue_for_execution( ...@@ -571,7 +571,7 @@ acpi_os_queue_for_execution(
ACPI_FUNCTION_TRACE ("os_queue_for_execution"); ACPI_FUNCTION_TRACE ("os_queue_for_execution");
ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "Scheduling function [%p(%p)] for deferred execution.\n", function, context)); ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "Scheduling function [%p(%p)] for deferred execution.\n", function, context));
if (!function) if (!function)
return_ACPI_STATUS (AE_BAD_PARAMETER); return_ACPI_STATUS (AE_BAD_PARAMETER);
...@@ -657,7 +657,7 @@ acpi_os_create_semaphore( ...@@ -657,7 +657,7 @@ acpi_os_create_semaphore(
*handle = (acpi_handle*)sem; *handle = (acpi_handle*)sem;
ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "Creating semaphore[%p|%d].\n", *handle, initial_units)); ACPI_DEBUG_PRINT ((ACPI_DB_MUTEX, "Creating semaphore[%p|%d].\n", *handle, initial_units));
return_ACPI_STATUS (AE_OK); return_ACPI_STATUS (AE_OK);
} }
...@@ -681,7 +681,7 @@ acpi_os_delete_semaphore( ...@@ -681,7 +681,7 @@ acpi_os_delete_semaphore(
if (!sem) if (!sem)
return_ACPI_STATUS (AE_BAD_PARAMETER); return_ACPI_STATUS (AE_BAD_PARAMETER);
ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "Deleting semaphore[%p].\n", handle)); ACPI_DEBUG_PRINT ((ACPI_DB_MUTEX, "Deleting semaphore[%p].\n", handle));
acpi_os_free(sem); sem = NULL; acpi_os_free(sem); sem = NULL;
...@@ -716,7 +716,7 @@ acpi_os_wait_semaphore( ...@@ -716,7 +716,7 @@ acpi_os_wait_semaphore(
if (units > 1) if (units > 1)
return_ACPI_STATUS (AE_SUPPORT); return_ACPI_STATUS (AE_SUPPORT);
ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "Waiting for semaphore[%p|%d|%d]\n", handle, units, timeout)); ACPI_DEBUG_PRINT ((ACPI_DB_MUTEX, "Waiting for semaphore[%p|%d|%d]\n", handle, units, timeout));
if (in_atomic()) if (in_atomic())
timeout = 0; timeout = 0;
...@@ -740,9 +740,7 @@ acpi_os_wait_semaphore( ...@@ -740,9 +740,7 @@ acpi_os_wait_semaphore(
* ------------------ * ------------------
*/ */
case ACPI_WAIT_FOREVER: case ACPI_WAIT_FOREVER:
ret = down_interruptible(sem); down(sem);
if (ret < 0)
status = AE_ERROR;
break; break;
/* /*
...@@ -763,16 +761,17 @@ acpi_os_wait_semaphore( ...@@ -763,16 +761,17 @@ acpi_os_wait_semaphore(
} }
if (ret != 0) if (ret != 0)
status = AE_TIME; status = AE_TIME;
} }
break; break;
} }
if (ACPI_FAILURE(status)) { if (ACPI_FAILURE(status)) {
ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "Failed to acquire semaphore[%p|%d|%d]\n", handle, units, timeout)); ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Failed to acquire semaphore[%p|%d|%d], %s\n",
handle, units, timeout, acpi_format_exception(status)));
} }
else { else {
ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "Acquired semaphore[%p|%d|%d]\n", handle, units, timeout)); ACPI_DEBUG_PRINT ((ACPI_DB_MUTEX, "Acquired semaphore[%p|%d|%d]\n", handle, units, timeout));
} }
return_ACPI_STATUS (status); return_ACPI_STATUS (status);
...@@ -797,7 +796,7 @@ acpi_os_signal_semaphore( ...@@ -797,7 +796,7 @@ acpi_os_signal_semaphore(
if (units > 1) if (units > 1)
return_ACPI_STATUS (AE_SUPPORT); return_ACPI_STATUS (AE_SUPPORT);
ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "Signaling semaphore[%p|%d]\n", handle, units)); ACPI_DEBUG_PRINT ((ACPI_DB_MUTEX, "Signaling semaphore[%p|%d]\n", handle, units));
up(sem); up(sem);
......
drivers/acpi/parser/psparse.c
View file @ 8309fa38
/****************************************************************************** /******************************************************************************
* *
* Module Name: psparse - Parser top level AML parse routines * Module Name: psparse - Parser top level AML parse routines
* $Revision: 134 $ * $Revision: 135 $
* *
*****************************************************************************/ *****************************************************************************/
...@@ -1078,7 +1078,8 @@ acpi_ps_parse_aml ( ...@@ -1078,7 +1078,8 @@ acpi_ps_parse_aml (
} }
ACPI_DEBUG_PRINT ((ACPI_DB_PARSE, ACPI_DEBUG_PRINT ((ACPI_DB_PARSE,
"Completed one call to walk loop, State=%p\n", walk_state)); "Completed one call to walk loop, %s State=%p\n",
acpi_format_exception (status), walk_state));
if (status == AE_CTRL_TRANSFER) { if (status == AE_CTRL_TRANSFER) {
/* /*
...@@ -1094,10 +1095,15 @@ acpi_ps_parse_aml ( ...@@ -1094,10 +1095,15 @@ acpi_ps_parse_aml (
walk_state = acpi_ds_get_current_walk_state (thread); walk_state = acpi_ds_get_current_walk_state (thread);
continue; continue;
} }
else if (status == AE_CTRL_TERMINATE) { else if (status == AE_CTRL_TERMINATE) {
status = AE_OK; status = AE_OK;
} }
else if (status != AE_OK) {
ACPI_REPORT_ERROR (("Method execution failed, %s\n",
acpi_format_exception (status)));
ACPI_DUMP_PATHNAME (walk_state->method_node, "Method pathname: ",
ACPI_LV_ERROR, _COMPONENT);
}
/* We are done with this walk, move on to the parent if any */ /* We are done with this walk, move on to the parent if any */
...@@ -1150,11 +1156,6 @@ acpi_ps_parse_aml ( ...@@ -1150,11 +1156,6 @@ acpi_ps_parse_aml (
/* On error, delete any return object */ /* On error, delete any return object */
acpi_ut_remove_reference (previous_walk_state->return_desc); acpi_ut_remove_reference (previous_walk_state->return_desc);
ACPI_REPORT_ERROR (("Method execution failed, %s\n",
acpi_format_exception (status)));
ACPI_DUMP_PATHNAME (walk_state->method_node, "Method pathname: ",
ACPI_LV_ERROR, _COMPONENT);
} }
} }
...@@ -1165,7 +1166,6 @@ acpi_ps_parse_aml ( ...@@ -1165,7 +1166,6 @@ acpi_ps_parse_aml (
else if (previous_walk_state->caller_return_desc) { else if (previous_walk_state->caller_return_desc) {
*(previous_walk_state->caller_return_desc) = previous_walk_state->return_desc; /* NULL if no return value */ *(previous_walk_state->caller_return_desc) = previous_walk_state->return_desc; /* NULL if no return value */
} }
else if (previous_walk_state->return_desc) { else if (previous_walk_state->return_desc) {
/* Caller doesn't want it, must delete it */ /* Caller doesn't want it, must delete it */
......
drivers/acpi/sleep.c
View file @ 8309fa38
...@@ -205,8 +205,10 @@ acpi_system_suspend( ...@@ -205,8 +205,10 @@ acpi_system_suspend(
break; break;
case ACPI_STATE_S2: case ACPI_STATE_S2:
#ifdef CONFIG_SOFTWARE_SUSPEND
case ACPI_STATE_S3: case ACPI_STATE_S3:
do_suspend_lowlevel(0); do_suspend_lowlevel(0);
#endif
break; break;
} }
local_irq_restore(flags); local_irq_restore(flags);
......
drivers/acpi/utilities/utobject.c
View file @ 8309fa38
/****************************************************************************** /******************************************************************************
* *
* Module Name: utobject - ACPI object create/delete/size/cache routines * Module Name: utobject - ACPI object create/delete/size/cache routines
* $Revision: 77 $ * $Revision: 79 $
* *
*****************************************************************************/ *****************************************************************************/
...@@ -114,6 +114,59 @@ acpi_ut_create_internal_object_dbg ( ...@@ -114,6 +114,59 @@ acpi_ut_create_internal_object_dbg (
} }
/*******************************************************************************
*
* FUNCTION: Acpi_ut_create_buffer_object
*
* PARAMETERS: Buffer_size - Size of buffer to be created
*
* RETURN: Pointer to a new Buffer object
*
* DESCRIPTION: Create a fully initialized buffer object
*
******************************************************************************/
acpi_operand_object *
acpi_ut_create_buffer_object (
ACPI_SIZE buffer_size)
{
acpi_operand_object *buffer_desc;
u8 *buffer;
ACPI_FUNCTION_TRACE_U32 ("Ut_create_buffer_object", buffer_size);
/*
* Create a new Buffer object
*/
buffer_desc = acpi_ut_create_internal_object (ACPI_TYPE_BUFFER);
if (!buffer_desc) {
return_PTR (NULL);
}
/* Allocate the actual buffer */
buffer = ACPI_MEM_CALLOCATE (buffer_size);
if (!buffer) {
ACPI_REPORT_ERROR (("Create_buffer: could not allocate size %X\n",
(u32) buffer_size));
acpi_ut_remove_reference (buffer_desc);
return_PTR (NULL);
}
/* Complete buffer object initialization */
buffer_desc->buffer.flags |= AOPOBJ_DATA_VALID;
buffer_desc->buffer.pointer = buffer;
buffer_desc->buffer.length = (u32) buffer_size;
/* Return the new buffer descriptor */
return_PTR (buffer_desc);
}
/******************************************************************************* /*******************************************************************************
* *
* FUNCTION: Acpi_ut_valid_internal_object * FUNCTION: Acpi_ut_valid_internal_object
...@@ -135,8 +188,7 @@ acpi_ut_valid_internal_object ( ...@@ -135,8 +188,7 @@ acpi_ut_valid_internal_object (
/* Check for a null pointer */ /* Check for a null pointer */
if (!object) { if (!object) {
ACPI_DEBUG_PRINT ((ACPI_DB_INFO, ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "**** Null Object Ptr\n"));
"**** Null Object Ptr\n"));
return (FALSE); return (FALSE);
} }
...@@ -161,10 +213,17 @@ acpi_ut_valid_internal_object ( ...@@ -161,10 +213,17 @@ acpi_ut_valid_internal_object (
"**** Obj %p is a parser obj, not ACPI obj\n", object)); "**** Obj %p is a parser obj, not ACPI obj\n", object));
break; break;
case ACPI_DESC_TYPE_CACHED:
ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
"**** Obj %p has already been released to internal cache\n", object));
break;
default: default:
ACPI_DEBUG_PRINT ((ACPI_DB_INFO, ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
"**** Obj %p is of unknown type\n", object)); "**** Obj %p has unknown descriptor type %X\n", object,
ACPI_GET_DESCRIPTOR_TYPE (object)));
break; break;
} }
......
drivers/char/tty_io.c
View file @ 8309fa38
...@@ -146,10 +146,9 @@ extern long serial167_console_init(void); ...@@ -146,10 +146,9 @@ extern long serial167_console_init(void);
extern void console_8xx_init(void); extern void console_8xx_init(void);
extern int rs_8xx_init(void); extern int rs_8xx_init(void);
extern void mac_scc_console_init(void); extern void mac_scc_console_init(void);
extern void hwc_console_init(void); extern void sclp_console_init(void);
extern void hwc_tty_init(void); extern void sclp_tty_init(void);
extern void con3215_init(void); extern void con3215_init(void);
extern void tty3215_init(void);
extern void tub3270_con_init(void); extern void tub3270_con_init(void);
extern void tub3270_init(void); extern void tub3270_init(void);
extern void uart_console_init(void); extern void uart_console_init(void);
...@@ -2208,8 +2207,8 @@ void __init console_init(void) ...@@ -2208,8 +2207,8 @@ void __init console_init(void)
#ifdef CONFIG_TN3215 #ifdef CONFIG_TN3215
con3215_init(); con3215_init();
#endif #endif
#ifdef CONFIG_HWC #ifdef CONFIG_SCLP_CONSOLE
hwc_console_init(); sclp_console_init();
#endif #endif
#ifdef CONFIG_STDIO_CONSOLE #ifdef CONFIG_STDIO_CONSOLE
stdio_console_init(); stdio_console_init();
...@@ -2349,8 +2348,8 @@ void __init tty_init(void) ...@@ -2349,8 +2348,8 @@ void __init tty_init(void)
#ifdef CONFIG_TN3215 #ifdef CONFIG_TN3215
tty3215_init(); tty3215_init();
#endif #endif
#ifdef CONFIG_HWC #ifdef CONFIG_SCLP
hwc_tty_init(); sclp_tty_init();
#endif #endif
#ifdef CONFIG_A2232 #ifdef CONFIG_A2232
a2232board_init(); a2232board_init();
......
drivers/s390/Kconfig
View file @ 8309fa38
...@@ -257,24 +257,30 @@ config TN3215_CONSOLE ...@@ -257,24 +257,30 @@ config TN3215_CONSOLE
Include support for using an IBM 3215 line-mode terminal as a Include support for using an IBM 3215 line-mode terminal as a
Linux system console. Linux system console.
config HWC config SCLP
bool "Support for HWC line mode terminal" bool "Support for SCLP"
help help
Include support for IBM HWC line-mode terminals. Include support for the SCLP interface to the service element.
config HWC_CONSOLE config SCLP_TTY
bool "console on HWC line mode terminal" bool "Support for SCLP line mode terminal"
depends on HWC depends on SCLP
help
Include support for IBM SCLP line-mode terminals.
config SCLP_CONSOLE
bool "Support for console on SCLP line mode terminal"
depends on SCLP_TTY
help help
Include support for using an IBM HWC line-mode terminal as the Linux Include support for using an IBM HWC line-mode terminal as the Linux
system console. system console.
config HWC_CPI config SCLP_CPI
tristate "Control-Program Identification" tristate "Control-Program Identification"
depends on HWC depends on SCLP
help help
This option enables the hardware console interface for system This option enables the hardware console interface for system
identification This is commonly used for workload management and identification. This is commonly used for workload management and
gives you a nice name for the system on the service element. gives you a nice name for the system on the service element.
Please select this option as a module since built-in operation is Please select this option as a module since built-in operation is
completely untested. completely untested.
......
drivers/s390/block/Makefile
View file @ 8309fa38
...@@ -11,9 +11,9 @@ dasd_mod-objs := dasd.o dasd_ioctl.o dasd_proc.o dasd_devmap.o \ ...@@ -11,9 +11,9 @@ dasd_mod-objs := dasd.o dasd_ioctl.o dasd_proc.o dasd_devmap.o \
dasd_genhd.o dasd_erp.o dasd_genhd.o dasd_erp.o
obj-$(CONFIG_DASD) += dasd_mod.o obj-$(CONFIG_DASD) += dasd_mod.o
obj-$(CONFIG_DASD_DIAG) += dasd_diag_mod.o
obj-$(CONFIG_DASD_ECKD) += dasd_eckd_mod.o obj-$(CONFIG_DASD_ECKD) += dasd_eckd_mod.o
obj-$(CONFIG_DASD_FBA) += dasd_fba_mod.o obj-$(CONFIG_DASD_FBA) += dasd_fba_mod.o
obj-$(CONFIG_DASD_DIAG) += dasd_diag_mod.o
obj-$(CONFIG_BLK_DEV_XPRAM) += xpram.o obj-$(CONFIG_BLK_DEV_XPRAM) += xpram.o
include $(TOPDIR)/Rules.make include $(TOPDIR)/Rules.make
drivers/s390/block/xpram.c
View file @ 8309fa38
...@@ -325,7 +325,6 @@ static int xpram_ioctl (struct inode *inode, struct file *filp, ...@@ -325,7 +325,6 @@ static int xpram_ioctl (struct inode *inode, struct file *filp,
{ {
struct hd_geometry *geo; struct hd_geometry *geo;
unsigned long size; unsigned long size;
int idx = minor(inode->i_rdev);
if (cmd != HDIO_GETGEO) if (cmd != HDIO_GETGEO)
return -EINVAL; return -EINVAL;
/* /*
...@@ -474,6 +473,7 @@ static int __init xpram_setup_blkdev(void) ...@@ -474,6 +473,7 @@ static int __init xpram_setup_blkdev(void)
out: out:
while (i--) while (i--)
put_disk(xpram_disks[i]); put_disk(xpram_disks[i]);
return rc;
} }
/* /*
......
drivers/s390/char/Makefile
View file @ 8309fa38
...@@ -2,28 +2,23 @@ ...@@ -2,28 +2,23 @@
# S/390 character devices # S/390 character devices
# #
export-objs := hwc_rw.o tape.o tape34xx.o export-objs := sclp_rw.o tape_core.o tape_devmap.o tape_std.o
tub3270-objs := tuball.o tubfs.o tubtty.o \ tub3270-objs := tuball.o tubfs.o tubtty.o \
tubttyaid.o tubttybld.o tubttyscl.o \ tubttyaid.o tubttybld.o tubttyscl.o \
tubttyrcl.o tubttysiz.o tubttyrcl.o tubttysiz.o
tape390-$(CONFIG_S390_TAPE_CHAR) += tapechar.o
tape390-$(CONFIG_S390_TAPE_BLOCK) += tapeblock.o
tape390-objs := tape.o tape34xx.o $(sort $(tape390-y))
tape_3480_mod-objs := tape3480.o
tape_3490_mod-objs := tape3490.o
obj-y += ctrlchar.o obj-y += ctrlchar.o
obj-$(CONFIG_TN3215) += con3215.o obj-$(CONFIG_TN3215) += con3215.o
obj-$(CONFIG_HWC) += hwc_con.o hwc_rw.o hwc_tty.o obj-$(CONFIG_SCLP) += sclp.o
obj-$(CONFIG_HWC_CPI) += hwc_cpi.o obj-$(CONFIG_SCLP_TTY) += sclp_rw.o sclp_tty.o
obj-$(CONFIG_SCLP_CONSOLE) += sclp_con.o
obj-$(CONFIG_SCLP_CPI) += sclp_cpi.o
obj-$(CONFIG_TN3270) += tub3270.o obj-$(CONFIG_TN3270) += tub3270.o
obj-$(CONFIG_S390_TAPE) += tape390.o tape-$(CONFIG_S390_TAPE_BLOCK) += tape_block.o
obj-$(CONFIG_S390_TAPE_3480) += tape_3480_mod.o tape-$(CONFIG_PROC_FS) += tape_proc.o
obj-$(CONFIG_S390_TAPE_3490) += tape_3490_mod.o tape-objs := tape_core.o tape_std.o tape_char.o $(tape-y)
obj-$(CONFIG_S390_TAPE) += tape.o
obj-$(CONFIG_S390_TAPE_34XX) += tape_34xx.o
include $(TOPDIR)/Rules.make include $(TOPDIR)/Rules.make
drivers/s390/char/hwc.h deleted 100644 → 0
View file @ 99cd91d7
/*
* drivers/s390/char/hwc.h
*
*
* S390 version
* Copyright (C) 1999 IBM Deutschland Entwicklung GmbH, IBM Corporation
* Author(s): Martin Peschke <mpeschke@de.ibm.com>
*
*
*
*/
#ifndef __HWC_H__
#define __HWC_H__
#define HWC_EXT_INT_PARAM_ADDR 0xFFFFFFF8
#define HWC_EXT_INT_PARAM_PEND 0x00000001
#define ET_OpCmd 0x01
#define ET_Msg 0x02
#define ET_StateChange 0x08
#define ET_PMsgCmd 0x09
#define ET_CntlProgOpCmd 0x20
#define ET_CntlProgIdent 0x0B
#define ET_SigQuiesce 0x1D
#define ET_OpCmd_Mask 0x80000000
#define ET_Msg_Mask 0x40000000
#define ET_StateChange_Mask 0x01000000
#define ET_PMsgCmd_Mask 0x00800000
#define ET_CtlProgOpCmd_Mask 0x00000001
#define ET_CtlProgIdent_Mask 0x00200000
#define ET_SigQuiesce_Mask 0x00000008
#define GMF_DOM 0x8000
#define GMF_SndAlrm 0x4000
#define GMF_HoldMsg 0x2000
#define LTF_CntlText 0x8000
#define LTF_LabelText 0x4000
#define LTF_DataText 0x2000
#define LTF_EndText 0x1000
#define LTF_PromptText 0x0800
#define HWC_COMMAND_INITIATED 0
#define HWC_BUSY 2
#define HWC_NOT_OPERATIONAL 3
#define hwc_cmdw_t u32;
#define HWC_CMDW_READDATA 0x00770005
#define HWC_CMDW_WRITEDATA 0x00760005
#define HWC_CMDW_WRITEMASK 0x00780005
#define GDS_ID_MDSMU 0x1310
#define GDS_ID_MDSRouteInfo 0x1311
#define GDS_ID_AgUnWrkCorr 0x1549
#define GDS_ID_SNACondReport 0x1532
#define GDS_ID_CPMSU 0x1212
#define GDS_ID_RoutTargInstr 0x154D
#define GDS_ID_OpReq 0x8070
#define GDS_ID_TextCmd 0x1320
#define GDS_KEY_SelfDefTextMsg 0x31
#define _HWCB_HEADER u16 length; \
u8 function_code; \
u8 control_mask[3]; \
u16 response_code;
#define _EBUF_HEADER u16 length; \
u8 type; \
u8 flags; \
u16 _reserved;
typedef struct {
_EBUF_HEADER
} __attribute__ ((packed))
evbuf_t;
#define _MDB_HEADER u16 length; \
u16 type; \
u32 tag; \
u32 revision_code;
#define _GO_HEADER u16 length; \
u16 type; \
u32 domid; \
u8 hhmmss_time[8]; \
u8 th_time[3]; \
u8 _reserved_0; \
u8 dddyyyy_date[7]; \
u8 _reserved_1; \
u16 general_msg_flags; \
u8 _reserved_2[10]; \
u8 originating_system_name[8]; \
u8 job_guest_name[8];
#define _MTO_HEADER u16 length; \
u16 type; \
u16 line_type_flags; \
u8 alarm_control; \
u8 _reserved[3];
typedef struct {
_GO_HEADER
} __attribute__ ((packed))
go_t;
typedef struct {
go_t go;
} __attribute__ ((packed))
mdb_body_t;
typedef struct {
_MDB_HEADER
mdb_body_t mdb_body;
} __attribute__ ((packed))
mdb_t;
typedef struct {
_EBUF_HEADER
mdb_t mdb;
} __attribute__ ((packed))
msgbuf_t;
typedef struct {
_HWCB_HEADER
msgbuf_t msgbuf;
} __attribute__ ((packed))
write_hwcb_t;
typedef struct {
_MTO_HEADER
} __attribute__ ((packed))
mto_t;
/* FIXME: don't define static variables in a header!!! */
#warning
static write_hwcb_t write_hwcb_template =
{
sizeof (write_hwcb_t),
0x00,
{
0x00,
0x00,
0x00
},
0x0000,
{
sizeof (msgbuf_t),
ET_Msg,
0x00,
0x0000,
{
sizeof (mdb_t),
0x0001,
0xD4C4C240,
0x00000001,
{
{
sizeof (go_t),
0x0001
}
}
}
}
};
#warning
static mto_t mto_template =
{
sizeof (mto_t),
0x0004,
LTF_EndText,
0x00
};
typedef u32 _hwcb_mask_t;
typedef struct {
_HWCB_HEADER
u16 _reserved;
u16 mask_length;
_hwcb_mask_t cp_receive_mask;
_hwcb_mask_t cp_send_mask;
_hwcb_mask_t hwc_receive_mask;
_hwcb_mask_t hwc_send_mask;
} __attribute__ ((packed))
init_hwcb_t;
#warning
static init_hwcb_t init_hwcb_template =
{
sizeof (init_hwcb_t),
0x00,
{
0x00,
0x00,
0x00
},
0x0000,
0x0000,
sizeof (_hwcb_mask_t),
ET_OpCmd_Mask | ET_PMsgCmd_Mask |
ET_StateChange_Mask | ET_SigQuiesce_Mask,
ET_Msg_Mask | ET_PMsgCmd_Mask | ET_CtlProgIdent_Mask
};
typedef struct {
_EBUF_HEADER
u8 validity_hwc_active_facility_mask:1;
u8 validity_hwc_receive_mask:1;
u8 validity_hwc_send_mask:1;
u8 validity_read_data_function_mask:1;
u16 _zeros:12;
u16 mask_length;
u64 hwc_active_facility_mask;
_hwcb_mask_t hwc_receive_mask;
_hwcb_mask_t hwc_send_mask;
u32 read_data_function_mask;
} __attribute__ ((packed))
statechangebuf_t;
#define _GDS_VECTOR_HEADER u16 length; \
u16 gds_id;
#define _GDS_SUBVECTOR_HEADER u8 length; \
u8 key;
typedef struct {
_GDS_VECTOR_HEADER
} __attribute__ ((packed))
gds_vector_t;
typedef struct {
_GDS_SUBVECTOR_HEADER
} __attribute__ ((packed))
gds_subvector_t;
typedef struct {
_HWCB_HEADER
} __attribute__ ((packed))
read_hwcb_t;
#warning
static read_hwcb_t read_hwcb_template =
{
PAGE_SIZE,
0x00,
{
0x00,
0x00,
0x80
}
};
#endif /* __HWC_H__ */
drivers/s390/char/hwc_con.c deleted 100644 → 0
View file @ 99cd91d7
/*
* drivers/s390/char/hwc_con.c
* HWC line mode console driver
*
* S390 version
* Copyright (C) 1999 IBM Deutschland Entwicklung GmbH, IBM Corporation
* Author(s): Martin Peschke <mpeschke@de.ibm.com>
*/
#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/major.h>
#include <linux/errno.h>
#include <linux/kdev_t.h>
#include <linux/string.h>
#include <linux/console.h>
#include <linux/fs.h>
#include <linux/init.h>
#include "hwc_rw.h"
#ifdef CONFIG_HWC_CONSOLE
#define hwc_console_major 4
#define hwc_console_minor 64
#define hwc_console_name "console"
void hwc_console_write (struct console *, const char *, unsigned int);
kdev_t hwc_console_device (struct console *);
void hwc_console_unblank (void);
#define HWC_CON_PRINT_HEADER "hwc console driver: "
struct console hwc_console =
{
.name = hwc_console_name,
.write = hwc_console_write,
.device = hwc_console_device,
.unblank = hwc_console_unblank,
.flags = CON_PRINTBUFFER,
};
void
hwc_console_write (
struct console *console,
const char *message,
unsigned int count)
{
if (kdev_val (console->device (console)) !=
kdev_val (hwc_console.device (&hwc_console))) {
hwc_printk (KERN_WARNING HWC_CON_PRINT_HEADER
"hwc_console_write() called with wrong "
"device number");
return;
}
hwc_write (0, message, count);
}
kdev_t
hwc_console_device (struct console * c)
{
return mk_kdev (hwc_console_major, hwc_console_minor);
}
void
hwc_console_unblank (void)
{
hwc_unblank ();
}
#endif
void __init
hwc_console_init (void)
{
if (!MACHINE_HAS_HWC)
return;
if (hwc_init () == 0) {
#ifdef CONFIG_HWC_CONSOLE
if (CONSOLE_IS_HWC)
register_console (&hwc_console);
#endif
} else
panic (HWC_CON_PRINT_HEADER "hwc initialisation failed !");
return;
}
drivers/s390/char/hwc_cpi.c deleted 100644 → 0
View file @ 99cd91d7
/*
* Author: Martin Peschke <mpeschke@de.ibm.com>
* Copyright (C) 2001 IBM Entwicklung GmbH, IBM Corporation
*/
#include <linux/string.h>
#include <linux/ctype.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/errno.h>
#include <linux/slab.h>
#include <linux/version.h>
#include <linux/sched.h>
#include <asm/semaphore.h>
#include <asm/ebcdic.h>
#include "hwc_rw.h"
#include "hwc.h"
#define CPI_RETRIES 3
#define CPI_SLEEP_TICKS 50
#define CPI_LENGTH_SYSTEM_TYPE 8
#define CPI_LENGTH_SYSTEM_NAME 8
#define CPI_LENGTH_SYSPLEX_NAME 8
typedef struct {
_EBUF_HEADER
u8 id_format;
u8 reserved0;
u8 system_type[CPI_LENGTH_SYSTEM_TYPE];
u64 reserved1;
u8 system_name[CPI_LENGTH_SYSTEM_NAME];
u64 reserved2;
u64 system_level;
u64 reserved3;
u8 sysplex_name[CPI_LENGTH_SYSPLEX_NAME];
u8 reserved4[16];
} __attribute__ ((packed))
cpi_evbuf_t;
typedef struct _cpi_hwcb_t {
_HWCB_HEADER
cpi_evbuf_t cpi_evbuf;
} __attribute__ ((packed))
cpi_hwcb_t;
cpi_hwcb_t *cpi_hwcb;
static int __init cpi_module_init (void);
static void __exit cpi_module_exit (void);
module_init (cpi_module_init);
module_exit (cpi_module_exit);
MODULE_AUTHOR (
"Martin Peschke, IBM Deutschland Entwicklung GmbH "
"<mpeschke@de.ibm.com>");
MODULE_DESCRIPTION (
"identify this operating system instance to the S/390 or zSeries hardware");
static char *system_name = NULL;
MODULE_PARM (system_name, "s");
MODULE_PARM_DESC (system_name, "e.g. hostname - max. 8 characters");
static char *sysplex_name = NULL;
#ifdef ALLOW_SYSPLEX_NAME
MODULE_PARM (sysplex_name, "s");
MODULE_PARM_DESC (sysplex_name, "if applicable - max. 8 characters");
#endif
static char *system_type = "LINUX";
hwc_request_t cpi_request =
{};
hwc_callback_t cpi_callback;
static DECLARE_MUTEX_LOCKED (sem);
static int __init
cpi_module_init (void)
{
int retval;
int system_type_length;
int system_name_length;
int sysplex_name_length = 0;
int retries;
if (!MACHINE_HAS_HWC) {
printk ("cpi: bug: hardware console not present\n");
retval = -EINVAL;
goto out;
}
if (!system_type) {
printk ("cpi: bug: no system type specified\n");
retval = -EINVAL;
goto out;
}
system_type_length = strlen (system_type);
if (system_type_length > CPI_LENGTH_SYSTEM_NAME) {
printk ("cpi: bug: system type has length of %i characters - "
"only %i characters supported\n",
system_type_length,
CPI_LENGTH_SYSTEM_TYPE);
retval = -EINVAL;
goto out;
}
if (!system_name) {
printk ("cpi: no system name specified\n");
retval = -EINVAL;
goto out;
}
system_name_length = strlen (system_name);
if (system_name_length > CPI_LENGTH_SYSTEM_NAME) {
printk ("cpi: system name has length of %i characters - "
"only %i characters supported\n",
system_name_length,
CPI_LENGTH_SYSTEM_NAME);
retval = -EINVAL;
goto out;
}
if (sysplex_name) {
sysplex_name_length = strlen (sysplex_name);
if (sysplex_name_length > CPI_LENGTH_SYSPLEX_NAME) {
printk ("cpi: sysplex name has length of %i characters - "
"only %i characters supported\n",
sysplex_name_length,
CPI_LENGTH_SYSPLEX_NAME);
retval = -EINVAL;
goto out;
}
}
cpi_hwcb = kmalloc (sizeof (cpi_hwcb_t), GFP_KERNEL);
if (!cpi_hwcb) {
printk ("cpi: no storage to fulfill request\n");
retval = -ENOMEM;
goto out;
}
memset (cpi_hwcb, 0, sizeof (cpi_hwcb_t));
cpi_hwcb->length = sizeof (cpi_hwcb_t);
cpi_hwcb->cpi_evbuf.length = sizeof (cpi_evbuf_t);
cpi_hwcb->cpi_evbuf.type = 0x0B;
memset (cpi_hwcb->cpi_evbuf.system_type, ' ', CPI_LENGTH_SYSTEM_TYPE);
memcpy (cpi_hwcb->cpi_evbuf.system_type, system_type, system_type_length);
HWC_ASCEBC_STR (cpi_hwcb->cpi_evbuf.system_type, CPI_LENGTH_SYSTEM_TYPE);
EBC_TOUPPER (cpi_hwcb->cpi_evbuf.system_type, CPI_LENGTH_SYSTEM_TYPE);
memset (cpi_hwcb->cpi_evbuf.system_name, ' ', CPI_LENGTH_SYSTEM_NAME);
memcpy (cpi_hwcb->cpi_evbuf.system_name, system_name, system_name_length);
HWC_ASCEBC_STR (cpi_hwcb->cpi_evbuf.system_name, CPI_LENGTH_SYSTEM_NAME);
EBC_TOUPPER (cpi_hwcb->cpi_evbuf.system_name, CPI_LENGTH_SYSTEM_NAME);
cpi_hwcb->cpi_evbuf.system_level = LINUX_VERSION_CODE;
if (sysplex_name) {
memset (cpi_hwcb->cpi_evbuf.sysplex_name, ' ', CPI_LENGTH_SYSPLEX_NAME);
memcpy (cpi_hwcb->cpi_evbuf.sysplex_name, sysplex_name, sysplex_name_length);
HWC_ASCEBC_STR (cpi_hwcb->cpi_evbuf.sysplex_name, CPI_LENGTH_SYSPLEX_NAME);
EBC_TOUPPER (cpi_hwcb->cpi_evbuf.sysplex_name, CPI_LENGTH_SYSPLEX_NAME);
}
cpi_request.block = cpi_hwcb;
cpi_request.word = HWC_CMDW_WRITEDATA;
cpi_request.callback = cpi_callback;
for (retries = CPI_RETRIES; retries; retries--) {
retval = hwc_send (&cpi_request);
if (retval) {
set_current_state (TASK_INTERRUPTIBLE);
schedule_timeout (CPI_SLEEP_TICKS);
} else {
down (&sem);
switch (cpi_hwcb->response_code) {
case 0x0020:
printk ("cpi: succeeded\n");
break;
default:
printk ("cpi: failed with response code 0x%x\n",
cpi_hwcb->response_code);
}
goto free;
}
}
printk ("cpi: failed (%i)\n", retval);
free:
kfree (cpi_hwcb);
out:
return retval;
}
static void __exit
cpi_module_exit (void)
{
printk ("cpi: exit\n");
}
void
cpi_callback (hwc_request_t * req)
{
up (&sem);
}
drivers/s390/char/hwc_rw.c deleted 100644 → 0
View file @ 99cd91d7
This diff is collapsed.
drivers/s390/char/hwc_rw.h deleted 100644 → 0
View file @ 99cd91d7
/*
* drivers/s390/char/hwc_rw.h
* interface to the HWC-read/write driver
*
* S390 version
* Copyright (C) 1999 IBM Deutschland Entwicklung GmbH, IBM Corporation
* Author(s): Martin Peschke <mpeschke@de.ibm.com>
*/
#ifndef __HWC_RW_H__
#define __HWC_RW_H__
#include <linux/ioctl.h>
typedef struct {
void (*move_input) (unsigned char *, unsigned int);
void (*wake_up) (void);
} hwc_high_level_calls_t;
struct _hwc_request;
typedef void hwc_callback_t (struct _hwc_request *);
typedef struct _hwc_request {
void *block;
u32 word;
hwc_callback_t *callback;
void *data;
} __attribute__ ((packed))
hwc_request_t;
#define HWC_ASCEBC(x) ((MACHINE_IS_VM ? _ascebc[x] : _ascebc_500[x]))
#define HWC_EBCASC_STR(s,c) ((MACHINE_IS_VM ? EBCASC(s,c) : EBCASC_500(s,c)))
#define HWC_ASCEBC_STR(s,c) ((MACHINE_IS_VM ? ASCEBC(s,c) : ASCEBC_500(s,c)))
#define IN_HWCB 1
#define IN_WRITE_BUF 2
#define IN_BUFS_TOTAL (IN_HWCB | IN_WRITE_BUF)
typedef unsigned short int ioctl_htab_t;
typedef unsigned char ioctl_echo_t;
typedef unsigned short int ioctl_cols_t;
typedef signed char ioctl_nl_t;
typedef unsigned short int ioctl_obuf_t;
typedef unsigned char ioctl_case_t;
typedef unsigned char ioctl_delim_t;
typedef struct {
ioctl_htab_t width_htab;
ioctl_echo_t echo;
ioctl_cols_t columns;
ioctl_nl_t final_nl;
ioctl_obuf_t max_hwcb;
ioctl_obuf_t kmem_hwcb;
ioctl_case_t tolower;
ioctl_delim_t delim;
} hwc_ioctls_t;
extern hwc_ioctls_t _hwc_ioctls;
#define HWC_IOCTL_LETTER 'B'
#define TIOCHWCSHTAB _IOW(HWC_IOCTL_LETTER, 0, _hwc_ioctls.width_htab)
#define TIOCHWCSECHO _IOW(HWC_IOCTL_LETTER, 1, _hwc_ioctls.echo)
#define TIOCHWCSCOLS _IOW(HWC_IOCTL_LETTER, 2, _hwc_ioctls.columns)
#define TIOCHWCSNL _IOW(HWC_IOCTL_LETTER, 4, _hwc_ioctls.final_nl)
#define TIOCHWCSOBUF _IOW(HWC_IOCTL_LETTER, 5, _hwc_ioctls.max_hwcb)
#define TIOCHWCSINIT _IO(HWC_IOCTL_LETTER, 6)
#define TIOCHWCSCASE _IOW(HWC_IOCTL_LETTER, 7, _hwc_ioctls.tolower)
#define TIOCHWCSDELIM _IOW(HWC_IOCTL_LETTER, 9, _hwc_ioctls.delim)
#define TIOCHWCGHTAB _IOR(HWC_IOCTL_LETTER, 10, _hwc_ioctls.width_htab)
#define TIOCHWCGECHO _IOR(HWC_IOCTL_LETTER, 11, _hwc_ioctls.echo)
#define TIOCHWCGCOLS _IOR(HWC_IOCTL_LETTER, 12, _hwc_ioctls.columns)
#define TIOCHWCGNL _IOR(HWC_IOCTL_LETTER, 14, _hwc_ioctls.final_nl)
#define TIOCHWCGOBUF _IOR(HWC_IOCTL_LETTER, 15, _hwc_ioctls.max_hwcb)
#define TIOCHWCGINIT _IOR(HWC_IOCTL_LETTER, 16, _hwc_ioctls)
#define TIOCHWCGCASE _IOR(HWC_IOCTL_LETTER, 17, _hwc_ioctls.tolower)
#define TIOCHWCGDELIM _IOR(HWC_IOCTL_LETTER, 19, _hwc_ioctls.delim)
#define TIOCHWCGKBUF _IOR(HWC_IOCTL_LETTER, 20, _hwc_ioctls.max_hwcb)
#define TIOCHWCGCURR _IOR(HWC_IOCTL_LETTER, 21, _hwc_ioctls)
#ifndef __HWC_RW_C__
extern int hwc_init (void);
extern int hwc_write (int from_user, const unsigned char *, unsigned int);
extern unsigned int hwc_chars_in_buffer (unsigned char);
extern unsigned int hwc_write_room (unsigned char);
extern void hwc_flush_buffer (unsigned char);
extern void hwc_unblank (void);
extern signed int hwc_ioctl (unsigned int, unsigned long);
extern void do_hwc_interrupt (void);
extern int hwc_printk (const char *,...);
extern signed int hwc_register_calls (hwc_high_level_calls_t *);
extern signed int hwc_unregister_calls (hwc_high_level_calls_t *);
extern int hwc_send (hwc_request_t *);
#endif
#endif
drivers/s390/char/hwc_tty.c deleted 100644 → 0
View file @ 99cd91d7
This diff is collapsed.
drivers/s390/char/sclp.c 0 → 100644
View file @ 8309fa38
This diff is collapsed.
drivers/s390/char/sclp.h 0 → 100644
View file @ 8309fa38
This diff is collapsed.
drivers/s390/char/sclp_con.c 0 → 100644
View file @ 8309fa38
This diff is collapsed.
drivers/s390/char/sclp_cpi.c 0 → 100644
View file @ 8309fa38
This diff is collapsed.
drivers/s390/char/sclp_rw.c 0 → 100644
View file @ 8309fa38
This diff is collapsed.
drivers/s390/char/sclp_rw.h 0 → 100644
View file @ 8309fa38
This diff is collapsed.
drivers/s390/char/sclp_tty.c 0 → 100644
View file @ 8309fa38
This diff is collapsed.
drivers/s390/char/sclp_tty.h 0 → 100644
View file @ 8309fa38
This diff is collapsed.
fs/proc/base.c
View file @ 8309fa38
...@@ -258,20 +258,18 @@ static int proc_pid_cmdline(struct task_struct *task, char * buffer) ...@@ -258,20 +258,18 @@ static int proc_pid_cmdline(struct task_struct *task, char * buffer)
*/ */
static int proc_pid_wchan(struct task_struct *task, char *buffer) static int proc_pid_wchan(struct task_struct *task, char *buffer)
{ {
const char *sym_name, *ignore; char *modname;
unsigned long wchan, dummy; const char *sym_name;
unsigned long wchan, size, offset;
wchan = get_wchan(task); wchan = get_wchan(task);
if (!kallsyms_address_to_symbol(wchan, &ignore, &dummy, &dummy, sym_name = kallsyms_lookup(wchan, &size, &offset, &modname);
&ignore, &dummy, &dummy, &sym_name, if (sym_name)
&dummy, &dummy)) { return sprintf(buffer, "%s", sym_name);
return sprintf(buffer, "%lu", wchan); return sprintf(buffer, "%lu", wchan);
}
return sprintf(buffer, "%s", sym_name);
} }
#endif #endif /* CONFIG_KALLSYMS */
/************************************************************************/ /************************************************************************/
/* Here the fs part begins */ /* Here the fs part begins */
......
include/asm-s390/debug.h
View file @ 8309fa38
...@@ -9,6 +9,8 @@ ...@@ -9,6 +9,8 @@
#ifndef DEBUG_H #ifndef DEBUG_H
#define DEBUG_H #define DEBUG_H
#include <linux/string.h>
/* Note: /* Note:
* struct __debug_entry must be defined outside of #ifdef __KERNEL__ * struct __debug_entry must be defined outside of #ifdef __KERNEL__
* in order to allow a user program to analyze the 'raw'-view. * in order to allow a user program to analyze the 'raw'-view.
......
include/asm-s390/ebcdic.h
View file @ 8309fa38
...@@ -32,7 +32,7 @@ void codepage_convert(const __u8 *codepage, volatile __u8 * addr, int nr) ...@@ -32,7 +32,7 @@ void codepage_convert(const __u8 *codepage, volatile __u8 * addr, int nr)
"0: tr 0(256,%0),0(%2)\n" "0: tr 0(256,%0),0(%2)\n"
" la %0,256(%0)\n" " la %0,256(%0)\n"
"1: ahi %1,-256\n" "1: ahi %1,-256\n"
" jp 0b\n" " jnm 0b\n"
" ex %1,0(1)" " ex %1,0(1)"
: "+&a" (addr), "+&a" (nr) : "+&a" (addr), "+&a" (nr)
: "a" (codepage) : "cc", "memory", "1" ); : "a" (codepage) : "cc", "memory", "1" );
......
include/asm-s390/lowcore.h
View file @ 8309fa38
...@@ -136,7 +136,7 @@ struct _lowcore ...@@ -136,7 +136,7 @@ struct _lowcore
/* SMP info area: defined by DJB */ /* SMP info area: defined by DJB */
__u64 jiffy_timer; /* 0xc80 */ __u64 jiffy_timer; /* 0xc80 */
atomic_t ext_call_fast; /* 0xc88 */ __u32 ext_call_fast; /* 0xc88 */
__u8 pad11[0xe00-0xc8c]; /* 0xc8c */ __u8 pad11[0xe00-0xc8c]; /* 0xc8c */
/* 0xe00 is used as indicator for dump tools */ /* 0xe00 is used as indicator for dump tools */
......
include/asm-s390/mman.h
View file @ 8309fa38
This diff is collapsed.
include/asm-s390/module.h
View file @ 8309fa38
This diff is collapsed.
include/asm-s390/pgtable.h
View file @ 8309fa38
This diff is collapsed.
include/asm-s390/poll.h
View file @ 8309fa38
This diff is collapsed.
include/asm-s390/setup.h
View file @ 8309fa38
This diff is collapsed.
include/asm-s390/smp.h
View file @ 8309fa38
This diff is collapsed.
include/asm-s390/tlbflush.h
View file @ 8309fa38
This diff is collapsed.
include/asm-s390/types.h
View file @ 8309fa38
This diff is collapsed.
include/asm-s390/uaccess.h
View file @ 8309fa38
This diff is collapsed.
include/asm-s390/unistd.h
View file @ 8309fa38
This diff is collapsed.
include/asm-s390x/debug.h
View file @ 8309fa38
This diff is collapsed.
include/asm-s390x/ebcdic.h
View file @ 8309fa38
This diff is collapsed.
include/asm-s390x/mman.h
View file @ 8309fa38
This diff is collapsed.
include/asm-s390x/module.h
View file @ 8309fa38
This diff is collapsed.
include/asm-s390x/pgtable.h
View file @ 8309fa38
This diff is collapsed.
include/asm-s390x/poll.h
View file @ 8309fa38
This diff is collapsed.
include/asm-s390x/setup.h
View file @ 8309fa38
This diff is collapsed.
include/asm-s390x/tlbflush.h
View file @ 8309fa38
This diff is collapsed.
include/asm-s390x/uaccess.h
View file @ 8309fa38
This diff is collapsed.
include/asm-s390x/unistd.h
View file @ 8309fa38
This diff is collapsed.
include/linux/elf.h
View file @ 8309fa38
This diff is collapsed.
include/linux/kallsyms.h
View file @ 8309fa38
This diff is collapsed.
include/linux/module.h
View file @ 8309fa38
This diff is collapsed.
kernel/kallsyms.c
View file @ 8309fa38
This diff is collapsed.
kernel/module.c
View file @ 8309fa38
This diff is collapsed.
net/core/dev.c
View file @ 8309fa38
This diff is collapsed.
scripts/kallsyms 0 → 100644
View file @ 8309fa38
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7