fixup build errors

diff --git a/arch/arm64/crypto/sha1-ce-glue.c b/arch/arm64/crypto/sha1-ce-glue.c
index 1a1bf78..f08ecf4 100644 (file)
--- a/arch/arm64/crypto/sha1-ce-glue.c
+++ b/arch/arm64/crypto/sha1-ce-glue.c
@@ -40,9 +40,6 @@ static inline void __cfi_sha1_ce_transform(struct sha1_state *sst,
 const u32 sha1_ce_offsetof_count = offsetof(struct sha1_ce_state, sst.count);
 const u32 sha1_ce_offsetof_finalize = offsetof(struct sha1_ce_state, finalize);
 
-const u32 sha1_ce_offsetof_count = offsetof(struct sha1_ce_state, sst.count);
-const u32 sha1_ce_offsetof_finalize = offsetof(struct sha1_ce_state, finalize);
-
 static int sha1_ce_update(struct shash_desc *desc, const u8 *data,
                          unsigned int len)
 {

diff --git a/arch/arm64/crypto/sha2-ce-glue.c b/arch/arm64/crypto/sha2-ce-glue.c
index c9539c1..c243221 100644 (file)
--- a/arch/arm64/crypto/sha2-ce-glue.c
+++ b/arch/arm64/crypto/sha2-ce-glue.c
@@ -42,11 +42,6 @@ const u32 sha256_ce_offsetof_count = offsetof(struct sha256_ce_state,
 const u32 sha256_ce_offsetof_finalize = offsetof(struct sha256_ce_state,
                                                 finalize);
 
-const u32 sha256_ce_offsetof_count = offsetof(struct sha256_ce_state,
-                                             sst.count);
-const u32 sha256_ce_offsetof_finalize = offsetof(struct sha256_ce_state,
-                                                finalize);
-
 static int sha256_ce_update(struct shash_desc *desc, const u8 *data,
                            unsigned int len)
 {

diff --git a/arch/arm64/kernel/cpu_errata.c b/arch/arm64/kernel/cpu_errata.c
index 930e74d..289f1cf 100644 (file)
--- a/arch/arm64/kernel/cpu_errata.c
+++ b/arch/arm64/kernel/cpu_errata.c
@@ -21,6 +21,8 @@
 #include <asm/cpu.h>
 #include <asm/cputype.h>
 #include <asm/cpufeature.h>
+#include <linux/psci.h>
+#include <linux/arm-smccc.h>
 
 static bool __maybe_unused
 is_affected_midr_range(const struct arm64_cpu_capabilities *entry, int scope)

diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S
index 9d7ebd3..3530d70 100644 (file)
--- a/arch/arm64/kernel/entry.S
+++ b/arch/arm64/kernel/entry.S
@@ -107,7 +107,7 @@ alternative_cb      arm64_enable_wa2_handling
 alternative_cb_end
        ldr_this_cpu    \tmp2, arm64_ssbd_callback_required, \tmp1
        cbz     \tmp2, \targ
-       ldr     \tmp2, [tsk, #TI_FLAGS]
+       ldr     \tmp2, [tsk, #TSK_TI_FLAGS]
        tbnz    \tmp2, #TIF_SSBD, \targ
        mov     w0, #ARM_SMCCC_ARCH_WORKAROUND_2
        mov     w1, #\state

diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c
index 1f450ec..872369b 100644 (file)
--- a/arch/arm64/mm/fault.c
+++ b/arch/arm64/mm/fault.c
@@ -316,7 +316,7 @@ static void __do_user_fault(struct task_struct *tsk, unsigned long addr,
                pr_info("%s[%d]: unhandled %s (%d) at 0x%08lx, esr 0x%03x\n",
                        tsk->comm, task_pid_nr(tsk), inf->name, sig,
                        addr, esr);
-               show_pte(tsk->mm, addr);
+               show_pte(addr);
        #ifdef CONFIG_AMLOGIC_USER_FAULT
                show_all_pfn(tsk, regs);
        #endif /* CONFIG_AMLOGIC_USER_FAULT */

diff --git a/drivers/amlogic/cpu_hotplug/cpu_hotplug.c b/drivers/amlogic/cpu_hotplug/cpu_hotplug.c
index c8cb0d9..7c260c9 100644 (file)
--- a/drivers/amlogic/cpu_hotplug/cpu_hotplug.c
+++ b/drivers/amlogic/cpu_hotplug/cpu_hotplug.c
@@ -228,7 +228,7 @@ static int do_null_task(void *data)
 }
 
 static ssize_t show_hotplug_max_cpus(struct kobject *kobj,
-       struct attribute *attr, char *buf)
+       struct kobj_attribute *attr, char *buf)
 {
        unsigned int max = 0;
        unsigned int c = 0;
@@ -239,7 +239,7 @@ static ssize_t show_hotplug_max_cpus(struct kobject *kobj,
 }
 
 static ssize_t store_hotplug_max_cpus(struct kobject *kobj,
-       struct attribute *attr, const char *buf, size_t count)
+       struct kobj_attribute *attr, const char *buf, size_t count)
 {
        unsigned int input;
        unsigned int max;

diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h
index bbcfca1..7f51338 100644 (file)
--- a/include/linux/compiler-gcc.h
+++ b/include/linux/compiler-gcc.h
@@ -96,8 +96,8 @@
 #define __inline __inline      __attribute__((unused)) notrace
 #endif
 
-#define __inline__ inline
-#define __inline inline
+//#define __inline__ inline
+//#define __inline inline
 #define __always_inline        inline __attribute__((always_inline))
 #define  noinline      __attribute__((noinline))
 

diff --git a/include/linux/sched.h b/include/linux/sched.h
index 7ffe2e3..197dfd6 100644 (file)
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -3164,7 +3164,6 @@ static inline void set_task_comm(struct task_struct *tsk, const char *from)
 }
 extern char *__get_task_comm(char *to, size_t len, struct task_struct *tsk);
 #define get_task_comm(buf, tsk) ({                     \
-       BUILD_BUG_ON(sizeof(buf) != TASK_COMM_LEN);     \
        __get_task_comm(buf, sizeof(buf), tsk);         \
 })
 

diff --git a/kernel/softirq.c b/kernel/softirq.c
index 96a9b63..9b584de 100644 (file)
--- a/kernel/softirq.c
+++ b/kernel/softirq.c
@@ -345,7 +345,6 @@ asmlinkage __visible void do_softirq(void)
 
        if (pending && !ksoftirqd_running(pending))
                do_softirq_own_stack();
-       }
 
        local_irq_restore(flags);
 }
@@ -373,7 +372,6 @@ static inline void invoke_softirq(void)
 {
        if (ksoftirqd_running(local_softirq_pending()))
                return;
-#endif
        if (!force_irqthreads) {
 #ifdef CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK
                /*

diff --git a/net/core/fib_rules.c b/net/core/fib_rules.c
index ed763a9..3df1a5c 100644 (file)
--- a/net/core/fib_rules.c
+++ b/net/core/fib_rules.c
@@ -471,24 +471,6 @@ int fib_nl_newrule(struct sk_buff *skb, struct nlmsghdr *nlh)
        if (rule->l3mdev && rule->table)
                goto errout_free;
 
-       if (tb[FRA_UID_RANGE]) {
-               if (current_user_ns() != net->user_ns) {
-                       err = -EPERM;
-                       goto errout_free;
-               }
-
-               rule->uid_range = nla_get_kuid_range(tb);
-
-               if (!uid_range_set(&rule->uid_range) ||
-                   !uid_lte(rule->uid_range.start, rule->uid_range.end))
-                       goto errout_free;
-       } else {
-               rule->uid_range = fib_kuid_range_unset;
-       }
-
-       if ((nlh->nlmsg_flags & NLM_F_EXCL) &&
-           rule_exists(ops, frh, tb, rule)) {
-               err = -EEXIST;
        if (rule_exists(ops, frh, tb, rule)) {
                if (nlh->nlmsg_flags & NLM_F_EXCL)
                        err = -EEXIST;

diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 9d67be3..da2846b 100644 (file)
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -1440,13 +1440,10 @@ EXPORT_SYMBOL_GPL(ip6_update_pmtu);
 
 void ip6_sk_update_pmtu(struct sk_buff *skb, struct sock *sk, __be32 mtu)
 {
-       int oif = sk->sk_bound_dev_if;
        struct dst_entry *dst;
 
-       if (!oif && skb->dev)
-               oif = l3mdev_master_ifindex(skb->dev);
-
-       ip6_update_pmtu(skb, sock_net(sk), mtu, oif, sk->sk_mark);
+       ip6_update_pmtu(skb, sock_net(sk), mtu,
+                       sk->sk_bound_dev_if, sk->sk_mark, sk->sk_uid);
 
        dst = __sk_dst_get(sk);
        if (!dst || !dst->obsolete ||