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

Commit 513335f9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'parisc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6 

Pull PARISC fixes from James Bottomley:
 "This is a set of three bug fixes for minor build breakages that got
  introduced just before 3.5-rc1 was released."

* tag 'parisc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6:
  [PARISC] fix code to find libgcc
  [PARISC] fix compile break in use of lib/strncopy_from_user.c
  [PARISC] fix missing TAINT_WARN problem
parents 0c30989c 4c01acc0

arch/parisc/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ KBUILD_DEFCONFIG := default_defconfig 


NM		= sh $(srctree)/arch/parisc/nm

CHECKFLAGS	+= -D__hppa__=1

LIBGCC		= $(shell $(CC) $(KBUILD_CFLAGS) -print-libgcc-file-name)



MACHINE		:= $(shell uname -m)

ifeq ($(MACHINE),parisc*)
@@ -79,7 +80,7 @@ kernel-y := mm/ kernel/ math-emu/ 
kernel-$(CONFIG_HPUX)		+= hpux/



core-y	+= $(addprefix arch/parisc/, $(kernel-y))

libs-y	+= arch/parisc/lib/ `$(CC) -print-libgcc-file-name`

libs-y	+= arch/parisc/lib/ $(LIBGCC)



drivers-$(CONFIG_OPROFILE)		+= arch/parisc/oprofile/

arch/parisc/include/asm/Kbuild

+1 −0
Original line number Diff line number Diff line 
include include/asm-generic/Kbuild.asm



header-y += pdc.h

generic-y += word-at-a-time.h

arch/parisc/include/asm/bug.h

+2 −0
Original line number Diff line number Diff line 
#ifndef _PARISC_BUG_H

#define _PARISC_BUG_H



#include <linux/kernel.h>	/* for BUGFLAG_TAINT */



/*

 * Tell the user there is some problem.

 * The offending file and line are encoded in the __bug_table section.