Skip to content

Commit f163937

Browse files
torvaldstorvalds
committed
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: [S390] Update default configuration. [S390] nss: add missing .previous statement to asm function [S390] increase default size of vmalloc area [S390] s390: disable change bit override [S390] fix io_return critical section cleanup [S390] sclp_async: potential buffer overflow [S390] arch/s390/kernel: Add missing unlock
2 parents 2f40842 + 8e7fccc commit f163937

File tree

8 files changed

+55
-26
lines changed

8 files changed

+55
-26
lines changed

‎arch/s390/defconfig

Lines changed: 30 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# Automatically generated make config: don't edit
3-
# Linux kernel version: 2.6.33-rc2
4-
# Mon Jan 4 09:03:07 2010
3+
# Linux kernel version: 2.6.34-rc3
4+
# Fri Apr 9 09:57:10 2010
55
#
66
CONFIG_SCHED_MC=y
77
CONFIG_MMU=y
@@ -17,6 +17,7 @@ CONFIG_GENERIC_TIME=y
1717
CONFIG_GENERIC_TIME_VSYSCALL=y
1818
CONFIG_GENERIC_CLOCKEVENTS=y
1919
CONFIG_GENERIC_BUG=y
20+
CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
2021
CONFIG_NO_IOMEM=y
2122
CONFIG_NO_DMA=y
2223
CONFIG_GENERIC_LOCKBREAK=y
@@ -62,15 +63,11 @@ CONFIG_TREE_RCU=y
6263
# CONFIG_RCU_TRACE is not set
6364
CONFIG_RCU_FANOUT=64
6465
# CONFIG_RCU_FANOUT_EXACT is not set
66+
# CONFIG_RCU_FAST_NO_HZ is not set
6567
# CONFIG_TREE_RCU_TRACE is not set
6668
CONFIG_IKCONFIG=y
6769
CONFIG_IKCONFIG_PROC=y
6870
CONFIG_LOG_BUF_SHIFT=17
69-
CONFIG_GROUP_SCHED=y
70-
CONFIG_FAIR_GROUP_SCHED=y
71-
# CONFIG_RT_GROUP_SCHED is not set
72-
CONFIG_USER_SCHED=y
73-
# CONFIG_CGROUP_SCHED is not set
7471
CONFIG_CGROUPS=y
7572
# CONFIG_CGROUP_DEBUG is not set
7673
CONFIG_CGROUP_NS=y
@@ -79,6 +76,7 @@ CONFIG_CGROUP_NS=y
7976
# CONFIG_CPUSETS is not set
8077
# CONFIG_CGROUP_CPUACCT is not set
8178
# CONFIG_RESOURCE_COUNTERS is not set
79+
# CONFIG_CGROUP_SCHED is not set
8280
CONFIG_SYSFS_DEPRECATED=y
8381
CONFIG_SYSFS_DEPRECATED_V2=y
8482
# CONFIG_RELAY is not set
@@ -93,6 +91,7 @@ CONFIG_INITRAMFS_SOURCE=""
9391
CONFIG_RD_GZIP=y
9492
CONFIG_RD_BZIP2=y
9593
CONFIG_RD_LZMA=y
94+
CONFIG_RD_LZO=y
9695
# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
9796
CONFIG_SYSCTL=y
9897
CONFIG_ANON_INODES=y
@@ -126,6 +125,7 @@ CONFIG_SLAB=y
126125
# CONFIG_SLUB is not set
127126
# CONFIG_SLOB is not set
128127
# CONFIG_PROFILING is not set
128+
CONFIG_TRACEPOINTS=y
129129
CONFIG_HAVE_OPROFILE=y
130130
CONFIG_KPROBES=y
131131
CONFIG_HAVE_SYSCALL_WRAPPERS=y
@@ -134,6 +134,7 @@ CONFIG_HAVE_KPROBES=y
134134
CONFIG_HAVE_KRETPROBES=y
135135
CONFIG_HAVE_ARCH_TRACEHOOK=y
136136
CONFIG_USE_GENERIC_SMP_HELPERS=y
137+
CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
137138
CONFIG_HAVE_DEFAULT_NO_SPIN_MUTEXES=y
138139

139140
#
@@ -246,6 +247,7 @@ CONFIG_64BIT=y
246247
CONFIG_SMP=y
247248
CONFIG_NR_CPUS=32
248249
CONFIG_HOTPLUG_CPU=y
250+
# CONFIG_SCHED_BOOK is not set
249251
CONFIG_COMPAT=y
250252
CONFIG_SYSVIPC_COMPAT=y
251253
CONFIG_AUDIT_ARCH=y
@@ -345,13 +347,13 @@ CONFIG_PM_SLEEP=y
345347
CONFIG_HIBERNATION=y
346348
CONFIG_PM_STD_PARTITION=""
347349
# CONFIG_PM_RUNTIME is not set
350+
CONFIG_PM_OPS=y
348351
CONFIG_NET=y
349352

350353
#
351354
# Networking options
352355
#
353356
CONFIG_PACKET=y
354-
# CONFIG_PACKET_MMAP is not set
355357
CONFIG_UNIX=y
356358
CONFIG_XFRM=y
357359
# CONFIG_XFRM_USER is not set
@@ -529,6 +531,7 @@ CONFIG_NET_SCH_FIFO=y
529531
#
530532
# CONFIG_NET_PKTGEN is not set
531533
# CONFIG_NET_TCPPROBE is not set
534+
# CONFIG_NET_DROP_MONITOR is not set
532535
CONFIG_CAN=m
533536
CONFIG_CAN_RAW=m
534537
CONFIG_CAN_BCM=m
@@ -605,6 +608,7 @@ CONFIG_MISC_DEVICES=y
605608
#
606609
# SCSI device support
607610
#
611+
CONFIG_SCSI_MOD=y
608612
# CONFIG_RAID_ATTRS is not set
609613
CONFIG_SCSI=y
610614
# CONFIG_SCSI_DMA is not set
@@ -863,6 +867,7 @@ CONFIG_MISC_FILESYSTEMS=y
863867
# CONFIG_BEFS_FS is not set
864868
# CONFIG_BFS_FS is not set
865869
# CONFIG_EFS_FS is not set
870+
# CONFIG_LOGFS is not set
866871
# CONFIG_CRAMFS is not set
867872
# CONFIG_SQUASHFS is not set
868873
# CONFIG_VXFS_FS is not set
@@ -891,6 +896,7 @@ CONFIG_SUNRPC=y
891896
# CONFIG_RPCSEC_GSS_KRB5 is not set
892897
# CONFIG_RPCSEC_GSS_SPKM3 is not set
893898
# CONFIG_SMB_FS is not set
899+
# CONFIG_CEPH_FS is not set
894900
# CONFIG_CIFS is not set
895901
# CONFIG_NCP_FS is not set
896902
# CONFIG_CODA_FS is not set
@@ -952,6 +958,7 @@ CONFIG_DEBUG_MUTEXES=y
952958
# CONFIG_LOCK_STAT is not set
953959
CONFIG_DEBUG_SPINLOCK_SLEEP=y
954960
# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
961+
CONFIG_STACKTRACE=y
955962
# CONFIG_DEBUG_KOBJECT is not set
956963
CONFIG_DEBUG_BUGVERBOSE=y
957964
# CONFIG_DEBUG_INFO is not set
@@ -973,12 +980,17 @@ CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y
973980
# CONFIG_LATENCYTOP is not set
974981
CONFIG_SYSCTL_SYSCALL_CHECK=y
975982
# CONFIG_DEBUG_PAGEALLOC is not set
983+
CONFIG_NOP_TRACER=y
976984
CONFIG_HAVE_FUNCTION_TRACER=y
977985
CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
978986
CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
979987
CONFIG_HAVE_DYNAMIC_FTRACE=y
980988
CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
981989
CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
990+
CONFIG_RING_BUFFER=y
991+
CONFIG_EVENT_TRACING=y
992+
CONFIG_CONTEXT_SWITCH_TRACER=y
993+
CONFIG_TRACING=y
982994
CONFIG_TRACING_SUPPORT=y
983995
CONFIG_FTRACE=y
984996
# CONFIG_FUNCTION_TRACER is not set
@@ -995,10 +1007,15 @@ CONFIG_BRANCH_PROFILE_NONE=y
9951007
# CONFIG_KMEMTRACE is not set
9961008
# CONFIG_WORKQUEUE_TRACER is not set
9971009
# CONFIG_BLK_DEV_IO_TRACE is not set
1010+
CONFIG_KPROBE_EVENT=y
1011+
# CONFIG_RING_BUFFER_BENCHMARK is not set
9981012
# CONFIG_DYNAMIC_DEBUG is not set
9991013
CONFIG_SAMPLES=y
1014+
# CONFIG_SAMPLE_TRACEPOINTS is not set
1015+
# CONFIG_SAMPLE_TRACE_EVENTS is not set
10001016
# CONFIG_SAMPLE_KOBJECT is not set
10011017
# CONFIG_SAMPLE_KPROBES is not set
1018+
# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
10021019

10031020
#
10041021
# Security options
@@ -1032,6 +1049,7 @@ CONFIG_CRYPTO_MANAGER=y
10321049
CONFIG_CRYPTO_MANAGER2=y
10331050
CONFIG_CRYPTO_GF128MUL=m
10341051
# CONFIG_CRYPTO_NULL is not set
1052+
# CONFIG_CRYPTO_PCRYPT is not set
10351053
CONFIG_CRYPTO_WORKQUEUE=y
10361054
# CONFIG_CRYPTO_CRYPTD is not set
10371055
CONFIG_CRYPTO_AUTHENC=m
@@ -1119,7 +1137,7 @@ CONFIG_CRYPTO_SHA512_S390=m
11191137
# CONFIG_CRYPTO_DES_S390 is not set
11201138
# CONFIG_CRYPTO_AES_S390 is not set
11211139
CONFIG_S390_PRNG=m
1122-
# CONFIG_BINARY_PRINTF is not set
1140+
CONFIG_BINARY_PRINTF=y
11231141

11241142
#
11251143
# Library routines
@@ -1136,14 +1154,16 @@ CONFIG_LIBCRC32C=m
11361154
CONFIG_ZLIB_INFLATE=y
11371155
CONFIG_ZLIB_DEFLATE=m
11381156
CONFIG_LZO_COMPRESS=m
1139-
CONFIG_LZO_DECOMPRESS=m
1157+
CONFIG_LZO_DECOMPRESS=y
11401158
CONFIG_DECOMPRESS_GZIP=y
11411159
CONFIG_DECOMPRESS_BZIP2=y
11421160
CONFIG_DECOMPRESS_LZMA=y
1161+
CONFIG_DECOMPRESS_LZO=y
11431162
CONFIG_NLATTR=y
11441163
CONFIG_HAVE_KVM=y
11451164
CONFIG_VIRTUALIZATION=y
11461165
CONFIG_KVM=m
1166+
# CONFIG_VHOST_NET is not set
11471167
CONFIG_VIRTIO=y
11481168
CONFIG_VIRTIO_RING=y
11491169
CONFIG_VIRTIO_BALLOON=m

‎arch/s390/include/asm/pgtable.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ extern char empty_zero_page[PAGE_SIZE];
105105
#ifndef __ASSEMBLY__
106106
/*
107107
* The vmalloc area will always be on the topmost area of the kernel
108-
* mapping. We reserve 96MB (31bit) / 1GB (64bit) for vmalloc,
108+
* mapping. We reserve 96MB (31bit) / 128GB (64bit) for vmalloc,
109109
* which should be enough for any sane case.
110110
* By putting vmalloc at the top, we maximise the gap between physical
111111
* memory and vmalloc to catch misplaced memory accesses. As a side
@@ -120,8 +120,8 @@ extern unsigned long VMALLOC_START;
120120
#define VMALLOC_END 0x7e000000UL
121121
#define VMEM_MAP_END 0x80000000UL
122122
#else /* __s390x__ */
123-
#define VMALLOC_SIZE (1UL << 30)
124-
#define VMALLOC_END 0x3e040000000UL
123+
#define VMALLOC_SIZE (128UL << 30)
124+
#define VMALLOC_END 0x3e000000000UL
125125
#define VMEM_MAP_END 0x40000000000UL
126126
#endif /* __s390x__ */
127127

‎arch/s390/kernel/early.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,8 @@ asm(
8282
" lm 6,15,24(15)\n"
8383
#endif
8484
" br 14\n"
85-
" .size savesys_ipl_nss, .-savesys_ipl_nss\n");
85+
" .size savesys_ipl_nss, .-savesys_ipl_nss\n"
86+
" .previous\n");
8687

8788
static __initdata char upper_command_line[COMMAND_LINE_SIZE];
8889

‎arch/s390/kernel/entry.S

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -964,7 +964,7 @@ cleanup_critical:
964964
clc 4(4,%r12),BASED(cleanup_table_io_work_loop)
965965
bl BASED(0f)
966966
clc 4(4,%r12),BASED(cleanup_table_io_work_loop+4)
967-
bl BASED(cleanup_io_return)
967+
bl BASED(cleanup_io_work_loop)
968968
0:
969969
br %r14
970970

@@ -1038,6 +1038,12 @@ cleanup_sysc_leave_insn:
10381038
.long sysc_done - 8 + 0x80000000
10391039

10401040
cleanup_io_return:
1041+
mvc __LC_RETURN_PSW(4),0(%r12)
1042+
mvc __LC_RETURN_PSW+4(4),BASED(cleanup_table_io_return)
1043+
la %r12,__LC_RETURN_PSW
1044+
br %r14
1045+
1046+
cleanup_io_work_loop:
10411047
mvc __LC_RETURN_PSW(4),0(%r12)
10421048
mvc __LC_RETURN_PSW+4(4),BASED(cleanup_table_io_work_loop)
10431049
la %r12,__LC_RETURN_PSW

‎arch/s390/kernel/entry64.S

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -946,7 +946,7 @@ cleanup_critical:
946946
clc 8(8,%r12),BASED(cleanup_table_io_work_loop)
947947
jl 0f
948948
clc 8(8,%r12),BASED(cleanup_table_io_work_loop+8)
949-
jl cleanup_io_return
949+
jl cleanup_io_work_loop
950950
0:
951951
br %r14
952952

@@ -1020,6 +1020,12 @@ cleanup_sysc_leave_insn:
10201020
.quad sysc_done - 16
10211021

10221022
cleanup_io_return:
1023+
mvc __LC_RETURN_PSW(8),0(%r12)
1024+
mvc __LC_RETURN_PSW+8(8),BASED(cleanup_table_io_return)
1025+
la %r12,__LC_RETURN_PSW
1026+
br %r14
1027+
1028+
cleanup_io_work_loop:
10231029
mvc __LC_RETURN_PSW(8),0(%r12)
10241030
mvc __LC_RETURN_PSW+8(8),BASED(cleanup_table_io_work_loop)
10251031
la %r12,__LC_RETURN_PSW

‎arch/s390/kernel/topology.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,10 +165,11 @@ static void tl_to_cores(struct tl_info *info)
165165
default:
166166
clear_cores();
167167
machine_has_topology = 0;
168-
return;
168+
goto out;
169169
}
170170
tle = next_tle(tle);
171171
}
172+
out:
172173
spin_unlock_irq(&topology_lock);
173174
}
174175

‎arch/s390/mm/vmem.c

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,8 @@ static pte_t __ref *vmem_pte_alloc(void)
7171
pte = alloc_bootmem(PTRS_PER_PTE * sizeof(pte_t));
7272
if (!pte)
7373
return NULL;
74-
if (MACHINE_HAS_HPAGE)
75-
clear_table((unsigned long *) pte, _PAGE_TYPE_EMPTY | _PAGE_CO,
76-
PTRS_PER_PTE * sizeof(pte_t));
77-
else
78-
clear_table((unsigned long *) pte, _PAGE_TYPE_EMPTY,
79-
PTRS_PER_PTE * sizeof(pte_t));
74+
clear_table((unsigned long *) pte, _PAGE_TYPE_EMPTY,
75+
PTRS_PER_PTE * sizeof(pte_t));
8076
return pte;
8177
}
8278

@@ -117,8 +113,7 @@ static int vmem_add_mem(unsigned long start, unsigned long size, int ro)
117113
if (MACHINE_HAS_HPAGE && !(address & ~HPAGE_MASK) &&
118114
(address + HPAGE_SIZE <= start + size) &&
119115
(address >= HPAGE_SIZE)) {
120-
pte_val(pte) |= _SEGMENT_ENTRY_LARGE |
121-
_SEGMENT_ENTRY_CO;
116+
pte_val(pte) |= _SEGMENT_ENTRY_LARGE;
122117
pmd_val(*pm_dir) = pte_val(pte);
123118
address += HPAGE_SIZE - PAGE_SIZE;
124119
continue;

‎drivers/s390/char/sclp_async.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ static int proc_handler_callhome(struct ctl_table *ctl, int write,
8585
rc = copy_from_user(buf, buffer, sizeof(buf));
8686
if (rc != 0)
8787
return -EFAULT;
88-
buf[len - 1] = '\0';
88+
buf[sizeof(buf) - 1] = '\0';
8989
if (strict_strtoul(buf, 0, &val) != 0)
9090
return -EINVAL;
9191
if (val != 0 && val != 1)

0 commit comments

Comments
 (0)