forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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: (72 commits) [S390] 3215/3270 console: remove wrong comment [S390] dasd: remove BKL from extended error reporting code [S390] vmlogrdr: remove BKL [S390] vmur: remove BKL [S390] zcrypt: remove BKL [S390] 3270: remove BKL [S390] vmwatchdog: remove lock_kernel() from open() function [S390] monwriter: remove lock_kernel() from open() function [S390] monreader: remove lock_kernel() from open() function [S390] s390: remove unused nfsd #includes [S390] ftrace: build ftrace.o when CONFIG_FTRACE_SYSCALLS is set for s390 [S390] etr/stp: put correct per cpu variable [S390] tty3270: move keyboard compat ioctls [S390] sclp: improve servicability setting [S390] s390: use change recording override for kernel mapping [S390] MAINTAINERS: Add s390 drivers block [S390] use generic sockios.h header file [S390] use generic termbits.h header file [S390] smp: remove unused typedef and defines [S390] cmm: free pages on hibernate. ...
- Loading branch information
Showing
76 changed files
with
2,727 additions
and
2,713 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3139,6 +3139,7 @@ S: Supported | |
F: Documentation/s390/kvm.txt | ||
F: arch/s390/include/asm/kvm* | ||
F: arch/s390/kvm/ | ||
F: drivers/s390/kvm/ | ||
|
||
KEXEC | ||
M: Eric Biederman <[email protected]> | ||
|
@@ -4553,6 +4554,7 @@ L: [email protected] | |
W: http://www.ibm.com/developerworks/linux/linux390/ | ||
S: Supported | ||
F: arch/s390/ | ||
F: drivers/s390/ | ||
|
||
S390 NETWORK DRIVERS | ||
M: Ursula Braun <[email protected]> | ||
|
@@ -4568,6 +4570,7 @@ M: Felix Beck <[email protected]> | |
M: Ralph Wuerthner <[email protected]> | ||
M: [email protected] | ||
L: [email protected] | ||
W: http://www.ibm.com/developerworks/linux/linux390/ | ||
S: Supported | ||
F: drivers/s390/crypto/ | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,57 +1,22 @@ | ||
/* | ||
* include/asm-s390/smp.h | ||
* | ||
* S390 version | ||
* Copyright (C) 1999 IBM Deutschland Entwicklung GmbH, IBM Corporation | ||
* Author(s): Denis Joseph Barrow ([email protected],[email protected]), | ||
* Martin Schwidefsky ([email protected]) | ||
* Heiko Carstens ([email protected]) | ||
* Copyright IBM Corp. 1999,2009 | ||
* Author(s): Denis Joseph Barrow, | ||
* Martin Schwidefsky <[email protected]>, | ||
* Heiko Carstens <[email protected]>, | ||
*/ | ||
#ifndef __ASM_SMP_H | ||
#define __ASM_SMP_H | ||
|
||
#include <linux/threads.h> | ||
#include <linux/cpumask.h> | ||
#include <linux/bitops.h> | ||
#ifdef CONFIG_SMP | ||
|
||
#if defined(__KERNEL__) && defined(CONFIG_SMP) && !defined(__ASSEMBLY__) | ||
|
||
#include <asm/lowcore.h> | ||
#include <asm/sigp.h> | ||
#include <asm/ptrace.h> | ||
#include <asm/system.h> | ||
|
||
/* | ||
s390 specific smp.c headers | ||
*/ | ||
typedef struct | ||
{ | ||
int intresting; | ||
sigp_ccode ccode; | ||
__u32 status; | ||
__u16 cpu; | ||
} sigp_info; | ||
#include <asm/sigp.h> | ||
|
||
extern void machine_restart_smp(char *); | ||
extern void machine_halt_smp(void); | ||
extern void machine_power_off_smp(void); | ||
|
||
#define NO_PROC_ID 0xFF /* No processor magic marker */ | ||
|
||
/* | ||
* This magic constant controls our willingness to transfer | ||
* a process across CPUs. Such a transfer incurs misses on the L1 | ||
* cache, and on a P6 or P5 with multiple L2 caches L2 hits. My | ||
* gut feeling is this will vary by board in value. For a board | ||
* with separate L2 cache it probably depends also on the RSS, and | ||
* for a board with shared L2 cache it ought to decay fast as other | ||
* processes are run. | ||
*/ | ||
|
||
#define PROC_CHANGE_PENALTY 20 /* Schedule penalty */ | ||
|
||
#define raw_smp_processor_id() (S390_lowcore.cpu_nr) | ||
#define cpu_logical_map(cpu) (cpu) | ||
|
||
extern int __cpu_disable (void); | ||
extern void __cpu_die (unsigned int cpu); | ||
|
@@ -64,13 +29,14 @@ extern int smp_cpu_polarization[]; | |
extern void arch_send_call_function_single_ipi(int cpu); | ||
extern void arch_send_call_function_ipi_mask(const struct cpumask *mask); | ||
|
||
#endif | ||
extern union save_area *zfcpdump_save_areas[NR_CPUS + 1]; | ||
|
||
#endif /* CONFIG_SMP */ | ||
|
||
#ifdef CONFIG_HOTPLUG_CPU | ||
extern int smp_rescan_cpus(void); | ||
#else | ||
static inline int smp_rescan_cpus(void) { return 0; } | ||
#endif | ||
|
||
extern union save_area *zfcpdump_save_areas[NR_CPUS + 1]; | ||
#endif | ||
#endif /* __ASM_SMP_H */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,21 +1,6 @@ | ||
/* | ||
* include/asm-s390/sockios.h | ||
* | ||
* S390 version | ||
* | ||
* Derived from "include/asm-i386/sockios.h" | ||
*/ | ||
#ifndef _ASM_S390_SOCKIOS_H | ||
#define _ASM_S390_SOCKIOS_H | ||
|
||
#ifndef __ARCH_S390_SOCKIOS__ | ||
#define __ARCH_S390_SOCKIOS__ | ||
|
||
/* Socket-level I/O control calls. */ | ||
#define FIOSETOWN 0x8901 | ||
#define SIOCSPGRP 0x8902 | ||
#define FIOGETOWN 0x8903 | ||
#define SIOCGPGRP 0x8904 | ||
#define SIOCATMARK 0x8905 | ||
#define SIOCGSTAMP 0x8906 /* Get stamp (timeval) */ | ||
#define SIOCGSTAMPNS 0x8907 /* Get stamp (timespec) */ | ||
#include <asm-generic/sockios.h> | ||
|
||
#endif |
Oops, something went wrong.