Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
09675bd3
Commit
09675bd3
authored
Apr 13, 2015
by
Jiri Kosina
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'for-4.1/core-s390' into for-linus
parents
bcf5d545
21042d43
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
46 additions
and
0 deletions
+46
-0
arch/s390/Kconfig
arch/s390/Kconfig
+3
-0
arch/s390/include/asm/livepatch.h
arch/s390/include/asm/livepatch.h
+43
-0
No files found.
arch/s390/Kconfig
View file @
09675bd3
...
@@ -133,6 +133,7 @@ config S390
...
@@ -133,6 +133,7 @@ config S390
select HAVE_KPROBES
select HAVE_KPROBES
select HAVE_KRETPROBES
select HAVE_KRETPROBES
select HAVE_KVM if 64BIT
select HAVE_KVM if 64BIT
select HAVE_LIVEPATCH
select HAVE_MEMBLOCK
select HAVE_MEMBLOCK
select HAVE_MEMBLOCK_NODE_MAP
select HAVE_MEMBLOCK_NODE_MAP
select HAVE_MEMBLOCK_PHYS_MAP
select HAVE_MEMBLOCK_PHYS_MAP
...
@@ -160,6 +161,8 @@ source "init/Kconfig"
...
@@ -160,6 +161,8 @@ source "init/Kconfig"
source "kernel/Kconfig.freezer"
source "kernel/Kconfig.freezer"
source "kernel/livepatch/Kconfig"
menu "Processor type and features"
menu "Processor type and features"
config HAVE_MARCH_Z900_FEATURES
config HAVE_MARCH_Z900_FEATURES
...
...
arch/s390/include/asm/livepatch.h
0 → 100644
View file @
09675bd3
/*
* livepatch.h - s390-specific Kernel Live Patching Core
*
* Copyright (c) 2013-2015 SUSE
* Authors: Jiri Kosina
* Vojtech Pavlik
* Jiri Slaby
*/
/*
* 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.
*/
#ifndef ASM_LIVEPATCH_H
#define ASM_LIVEPATCH_H
#include <linux/module.h>
#ifdef CONFIG_LIVEPATCH
static
inline
int
klp_check_compiler_support
(
void
)
{
return
0
;
}
static
inline
int
klp_write_module_reloc
(
struct
module
*
mod
,
unsigned
long
type
,
unsigned
long
loc
,
unsigned
long
value
)
{
/* not supported yet */
return
-
ENOSYS
;
}
static
inline
void
klp_arch_set_pc
(
struct
pt_regs
*
regs
,
unsigned
long
ip
)
{
regs
->
psw
.
addr
=
ip
;
}
#else
#error Live patching support is disabled; check CONFIG_LIVEPATCH
#endif
#endif
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment