Gh0st
/
linux
mirror of https://github.com/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
linux/arch/um/include/shared
History
Geert Uytterhoeven 9429ec96c2 um: Preinclude include/linux/kern_levels.h 
The userspace part of UML uses the asm-offsets.h generator mechanism to
create definitions for UM_KERN_<LEVEL> that match the in-kernel
KERN_<LEVEL> constant definitions.

As of commit 04d2c8c83d ("printk: convert
the format for KERN_<LEVEL> to a 2 byte pattern"), KERN_<LEVEL> is no
longer expanded to the literal '"<LEVEL>"', but to '"\001" "LEVEL"', i.e.
it contains two parts.

However, the combo of DEFINE_STR() in
arch/x86/um/shared/sysdep/kernel-offsets.h and sed-y in Kbuild doesn't
support string literals consisting of multiple parts. Hence for all
UM_KERN_<LEVEL> definitions, only the SOH character is retained in the actual
definition, while the remainder ends up in the comment. E.g. in
include/generated/asm-offsets.h we get

    #define UM_KERN_INFO "\001" /* "6" KERN_INFO */

instead of

    #define UM_KERN_INFO "\001" "6" /* KERN_INFO */

This causes spurious '^A' output in some kernel messages:

    Calibrating delay loop... 4640.76 BogoMIPS (lpj=23203840)
    pid_max: default: 32768 minimum: 301
    Mount-cache hash table entries: 256
    ^AChecking that host ptys support output SIGIO...Yes
    ^AChecking that host ptys support SIGIO on close...No, enabling workaround
    ^AUsing 2.6 host AIO
    NET: Registered protocol family 16
    bio: create slab <bio-0> at 0
    Switching to clocksource itimer

To fix this:
  - Move the mapping from UM_KERN_<LEVEL> to KERN_<LEVEL> from
    arch/um/include/shared/common-offsets.h to
    arch/um/include/shared/user.h, which is preincluded for all userspace
    parts,
  - Preinclude include/linux/kern_levels.h for all userspace parts, to
    obtain the in-kernel KERN_<LEVEL> constant definitions. This doesn't
    violate the kernel/userspace separation, as include/linux/kern_levels.h
    is self-contained and doesn't expose any other kernel internals.
  - Remove the now unused STR() and DEFINE_STR() macros.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Richard Weinberger <richard@nod.at>
 		2012-09-27 20:20:09 +02:00
..
skas
…
aio.h
…
arch.h
…
as-layout.h um: pass siginfo to guest process 2012-08-02 00:49:17 +02:00
common-offsets.h um: Preinclude include/linux/kern_levels.h 2012-09-27 20:20:09 +02:00
elf_user.h
…
frame_kern.h most of set_current_blocked() callers want SIGKILL/SIGSTOP removed from set 2012-06-01 12:58:51 -04:00
init.h fbdev: move logo externs to header file 2009-06-16 19:47:57 -07:00
irq_kern.h um: Implement um_free_irq() 2012-05-21 21:09:36 +02:00
irq_user.h um: pass siginfo to guest process 2012-08-02 00:49:17 +02:00
kern.h um: trim kern.h 2011-11-02 14:15:07 +01:00
kern_util.h um: pass siginfo to guest process 2012-08-02 00:49:17 +02:00
longjmp.h
…
mem.h
…
mem_user.h
…
net_kern.h uml: convert network device to internal network device stats 2009-03-27 00:46:39 -07:00
net_user.h uml: UML net driver does not allow for vlans 2009-06-16 19:47:46 -07:00
os.h um: merge os-Linux/tls.c into arch/x86/um/os-Linux/tls.c 2011-11-02 14:15:17 +01:00
ptrace_user.h um: unify ptrace_user.h 2011-11-02 14:15:27 +01:00
registers.h um: Save FPU registers between task switches 2011-09-14 18:09:37 -07:00
sigio.h
…
skas_ptrace.h
…
sysrq.h
…
um_malloc.h um: get rid of kern_constants.h 2011-11-02 14:14:45 +01:00
user.h um: Preinclude include/linux/kern_levels.h 2012-09-27 20:20:09 +02:00