b6407a85f0
Update to the latest upstream commit 47216437e79a ("Fix "net" command on
kernel configured with CONFIG_IPV6=m")
Resolves: rhbz#2166880
Resolves: rhbz#2161133
Resolves: rhbz#2158721
Resolves: rhbz#2156904
Resolves: rhbz#2156898
Resolves: rhbz#2156892
Resolves: rhbz#2156889
Resolves: rhbz#2156885
Resolves: rhbz#2152619
Signed-off-by: Lianbo Jiang <lijiang@redhat.com>
57 lines
2.0 KiB
Diff
57 lines
2.0 KiB
Diff
From 275b62afe8fd7446fc31025998b6d0fd47ec8be0 Mon Sep 17 00:00:00 2001
|
|
From: Hari Bathini <hbathini@linux.ibm.com>
|
|
Date: Mon, 4 Jul 2022 10:55:43 +0530
|
|
Subject: [PATCH 21/89] ppc64: rename ppc64_paca_init to
|
|
ppc64_paca_percpu_offset_init
|
|
|
|
ppc64_paca_init() function is specifically used to initialize percpu
|
|
data_offset for kernels older than v2.6.36. So, the name is slightly
|
|
misleading. Rename it to ppc64_paca_percpu_offset_init to reflect its
|
|
purpose.
|
|
|
|
Signed-off-by: Hari Bathini <hbathini@linux.ibm.com>
|
|
Signed-off-by: Lianbo Jiang <lijiang@redhat.com>
|
|
---
|
|
ppc64.c | 9 +++++----
|
|
1 file changed, 5 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/ppc64.c b/ppc64.c
|
|
index 272eb207074a..0a3aa5f7af91 100644
|
|
--- a/ppc64.c
|
|
+++ b/ppc64.c
|
|
@@ -52,7 +52,7 @@ static char * ppc64_check_eframe(struct ppc64_pt_regs *);
|
|
static void ppc64_print_eframe(char *, struct ppc64_pt_regs *,
|
|
struct bt_info *);
|
|
static void parse_cmdline_args(void);
|
|
-static int ppc64_paca_init(int);
|
|
+static int ppc64_paca_percpu_offset_init(int);
|
|
static void ppc64_init_cpu_info(void);
|
|
static int ppc64_get_cpu_map(void);
|
|
static void ppc64_clear_machdep_cache(void);
|
|
@@ -3285,7 +3285,7 @@ parse_cmdline_args(void)
|
|
* Initialize the per cpu data_offset values from paca structure.
|
|
*/
|
|
static int
|
|
-ppc64_paca_init(int map)
|
|
+ppc64_paca_percpu_offset_init(int map)
|
|
{
|
|
int i, cpus, nr_paca;
|
|
char *cpu_paca_buf;
|
|
@@ -3387,10 +3387,11 @@ ppc64_init_cpu_info(void)
|
|
* which was removed post v2.6.15 ppc64 and now we get the per cpu
|
|
* data_offset from __per_cpu_offset symbol during kernel_init()
|
|
* call. Hence for backward (pre-2.6.36) compatibility, call
|
|
- * ppc64_paca_init() only if symbol __per_cpu_offset does not exist.
|
|
+ * ppc64_paca_percpu_offset_init() only if symbol __per_cpu_offset
|
|
+ * does not exist.
|
|
*/
|
|
if (!symbol_exists("__per_cpu_offset"))
|
|
- cpus = ppc64_paca_init(map);
|
|
+ cpus = ppc64_paca_percpu_offset_init(map);
|
|
else {
|
|
if (!(nr_cpus = get_array_length("__per_cpu_offset", NULL, 0)))
|
|
nr_cpus = (kt->kernel_NR_CPUS ? kt->kernel_NR_CPUS :
|
|
--
|
|
2.37.1
|
|
|