mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 02:50:43 +00:00
Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull core fixes from Ingo Molnar: "Two fixes: - objtool cross-build fixes - removal of an obsolete CPU-hotplug state name from comments" * 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: objtool: Fix 64-bit build on 32-bit host cpu/hotplug: Fix state name in takedown_cpu() comment
This commit is contained in:
commit
07eca14b6f
3 changed files with 11 additions and 8 deletions
|
@ -780,8 +780,8 @@ static int takedown_cpu(unsigned int cpu)
|
|||
BUG_ON(cpu_online(cpu));
|
||||
|
||||
/*
|
||||
* The CPUHP_AP_SCHED_MIGRATE_DYING callback will have removed all
|
||||
* runnable tasks from the cpu, there's only the idle task left now
|
||||
* The teardown callback for CPUHP_AP_SCHED_STARTING will have removed
|
||||
* all runnable tasks from the CPU, there's only the idle task left now
|
||||
* that the migration thread is done doing the stop_machine thing.
|
||||
*
|
||||
* Wait for the stop thread to go away.
|
||||
|
|
|
@ -7,9 +7,11 @@ ARCH := x86
|
|||
endif
|
||||
|
||||
# always use the host compiler
|
||||
CC = gcc
|
||||
LD = ld
|
||||
AR = ar
|
||||
HOSTCC ?= gcc
|
||||
HOSTLD ?= ld
|
||||
CC = $(HOSTCC)
|
||||
LD = $(HOSTLD)
|
||||
AR = ar
|
||||
|
||||
ifeq ($(srctree),)
|
||||
srctree := $(patsubst %/,%,$(dir $(CURDIR)))
|
||||
|
|
|
@ -76,7 +76,8 @@ int orc_dump(const char *_objname)
|
|||
int fd, nr_entries, i, *orc_ip = NULL, orc_size = 0;
|
||||
struct orc_entry *orc = NULL;
|
||||
char *name;
|
||||
unsigned long nr_sections, orc_ip_addr = 0;
|
||||
size_t nr_sections;
|
||||
Elf64_Addr orc_ip_addr = 0;
|
||||
size_t shstrtab_idx;
|
||||
Elf *elf;
|
||||
Elf_Scn *scn;
|
||||
|
@ -187,10 +188,10 @@ int orc_dump(const char *_objname)
|
|||
return -1;
|
||||
}
|
||||
|
||||
printf("%s+%lx:", name, rela.r_addend);
|
||||
printf("%s+%llx:", name, (unsigned long long)rela.r_addend);
|
||||
|
||||
} else {
|
||||
printf("%lx:", orc_ip_addr + (i * sizeof(int)) + orc_ip[i]);
|
||||
printf("%llx:", (unsigned long long)(orc_ip_addr + (i * sizeof(int)) + orc_ip[i]));
|
||||
}
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue