generic: 4.4: refresh patches

Signed-off-by: Luka Perkov <luka.perkov@sartura.hr>

SVN-Revision: 48506
This commit is contained in:
Luka Perkov 2016-01-26 11:30:45 +00:00
parent a6a6f36ad1
commit 9aebe0f782
3 changed files with 2 additions and 21 deletions

View File

@ -58,11 +58,9 @@ Signed-off-by: David Howells <dhowells@redhat.com>
security/keys/process_keys.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/security/keys/process_keys.c b/security/keys/process_keys.c
index a3f85d2..e6d50172 100644
--- a/security/keys/process_keys.c
+++ b/security/keys/process_keys.c
@@ -794,6 +794,7 @@ long join_session_keyring(const char *name)
@@ -794,6 +794,7 @@ long join_session_keyring(const char *na
ret = PTR_ERR(keyring);
goto error2;
} else if (keyring == new->session_keyring) {
@ -70,6 +68,3 @@ index a3f85d2..e6d50172 100644
ret = 0;
goto error2;
}
--
2.7.0.rc3

View File

@ -18,8 +18,6 @@ Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
arch/arc/Kconfig | 2 --
1 file changed, 2 deletions(-)
diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig
index 6312f60..a95bab3 100644
--- a/arch/arc/Kconfig
+++ b/arch/arc/Kconfig
@@ -12,8 +12,6 @@ config ARC
@ -31,6 +29,3 @@ index 6312f60..a95bab3 100644
select GENERIC_ATOMIC64
select GENERIC_CLOCKEVENTS
select GENERIC_FIND_FIRST_BIT
--
2.4.3

View File

@ -19,8 +19,6 @@ Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
arch/arc/kernel/vmlinux.lds.S | 13 +++++++++++++
3 files changed, 26 insertions(+), 1 deletion(-)
diff --git a/arch/arc/kernel/head.S b/arch/arc/kernel/head.S
index 689dd86..51154ae 100644
--- a/arch/arc/kernel/head.S
+++ b/arch/arc/kernel/head.S
@@ -49,6 +49,16 @@
@ -40,11 +38,9 @@ index 689dd86..51154ae 100644
.section .init.text, "ax",@progbits
;----------------------------------------------------------------
diff --git a/arch/arc/kernel/setup.c b/arch/arc/kernel/setup.c
index e1b8744..9481c9d 100644
--- a/arch/arc/kernel/setup.c
+++ b/arch/arc/kernel/setup.c
@@ -370,6 +370,8 @@ static inline int is_kernel(unsigned long addr)
@@ -370,6 +370,8 @@ static inline int is_kernel(unsigned lon
return 0;
}
@ -62,8 +58,6 @@ index e1b8744..9481c9d 100644
if (!machine_desc)
panic("Embedded DT invalid\n");
diff --git a/arch/arc/kernel/vmlinux.lds.S b/arch/arc/kernel/vmlinux.lds.S
index 894e696..ecfc284 100644
--- a/arch/arc/kernel/vmlinux.lds.S
+++ b/arch/arc/kernel/vmlinux.lds.S
@@ -30,6 +30,19 @@ SECTIONS
@ -86,6 +80,3 @@ index 894e696..ecfc284 100644
_int_vec_base_lds = .;
.vector : {
*(.vector)
--
2.4.3