Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 44456d37 authored by Olaf Hering's avatar Olaf Hering Committed by Linus Torvalds
Browse files

[PATCH] turn many #if $undefined_string into #ifdef $undefined_string 



turn many #if $undefined_string into #ifdef $undefined_string to fix some
warnings after -Wno-def was added to global CFLAGS

Signed-off-by: default avatarOlaf Hering <olh@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 02b77569

arch/ppc64/kernel/udbg.c

+1 −1
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ void udbg_init_scc(struct device_node *np) 


#endif /* CONFIG_PPC_PMAC */



#if CONFIG_PPC_PMAC

#ifdef CONFIG_PPC_PMAC

static void udbg_real_putc(unsigned char c)

{

	while ((real_readb(sccc) & SCC_TXRDY) == 0)

arch/um/drivers/cow.h

+2 −2
Original line number Diff line number Diff line
@@ -3,10 +3,10 @@ 


#include <asm/types.h>



#if __BYTE_ORDER == __BIG_ENDIAN

#if defined(__BIG_ENDIAN)

# define ntohll(x) (x)

# define htonll(x) (x)

#elif __BYTE_ORDER == __LITTLE_ENDIAN

#elif defined(__LITTLE_ENDIAN)

# define ntohll(x)  bswap_64(x)

# define htonll(x)  bswap_64(x)

#else

arch/um/kernel/skas/syscall_user.c

+2 −2
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
void handle_syscall(union uml_pt_regs *regs)

{

	long result;

#if UML_CONFIG_SYSCALL_DEBUG

#ifdef UML_CONFIG_SYSCALL_DEBUG

  	int index;



  	index = record_syscall_start(UPT_SYSCALL_NR(regs));
@@ -27,7 +27,7 @@ void handle_syscall(union uml_pt_regs *regs) 
	REGS_SET_SYSCALL_RETURN(regs->skas.regs, result);



	syscall_trace(regs, 1);

#if UML_CONFIG_SYSCALL_DEBUG

#ifdef UML_CONFIG_SYSCALL_DEBUG

  	record_syscall_end(index, result);

#endif

}

arch/um/os-Linux/elf_aux.c

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <stddef.h>

#include "init.h"

#include "elf_user.h"

#include <asm/elf.h>



#if ELF_CLASS == ELFCLASS32

typedef Elf32_auxv_t elf_auxv_t;

arch/x86_64/ia32/ia32_aout.c

+3 −3
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ extern int ia32_setup_arg_pages(struct linux_binprm *bprm, 
static int load_aout_binary(struct linux_binprm *, struct pt_regs * regs);

static int load_aout_library(struct file*);



#if CORE_DUMP

#ifdef CORE_DUMP

static int aout_core_dump(long signr, struct pt_regs * regs, struct file *file);



/*
@@ -103,7 +103,7 @@ static struct linux_binfmt aout_format = { 
	.module		= THIS_MODULE,

	.load_binary	= load_aout_binary,

	.load_shlib	= load_aout_library,

#if CORE_DUMP

#ifdef CORE_DUMP

	.core_dump	= aout_core_dump,

#endif

	.min_coredump	= PAGE_SIZE
@@ -120,7 +120,7 @@ static void set_brk(unsigned long start, unsigned long end) 
	up_write(&current->mm->mmap_sem);

}



#if CORE_DUMP

#ifdef CORE_DUMP

/*

 * These are the only things you should do on a core-file: use only these

 * macros to write out all the necessary info.