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

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
...@@ -21,6 +21,7 @@ KBUILD_DEFCONFIG := default_defconfig ...@@ -21,6 +21,7 @@ KBUILD_DEFCONFIG := default_defconfig
NM = sh $(srctree)/arch/parisc/nm NM = sh $(srctree)/arch/parisc/nm
CHECKFLAGS += -D__hppa__=1 CHECKFLAGS += -D__hppa__=1
LIBGCC = $(shell $(CC) $(KBUILD_CFLAGS) -print-libgcc-file-name)
MACHINE := $(shell uname -m) MACHINE := $(shell uname -m)
ifeq ($(MACHINE),parisc*) ifeq ($(MACHINE),parisc*)
...@@ -79,7 +80,7 @@ kernel-y := mm/ kernel/ math-emu/ ...@@ -79,7 +80,7 @@ kernel-y := mm/ kernel/ math-emu/
kernel-$(CONFIG_HPUX) += hpux/ kernel-$(CONFIG_HPUX) += hpux/
core-y += $(addprefix arch/parisc/, $(kernel-y)) 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/ drivers-$(CONFIG_OPROFILE) += arch/parisc/oprofile/
......
include include/asm-generic/Kbuild.asm include include/asm-generic/Kbuild.asm
header-y += pdc.h header-y += pdc.h
generic-y += word-at-a-time.h
#ifndef _PARISC_BUG_H #ifndef _PARISC_BUG_H
#define _PARISC_BUG_H #define _PARISC_BUG_H
#include <linux/kernel.h> /* for BUGFLAG_TAINT */
/* /*
* Tell the user there is some problem. * Tell the user there is some problem.
* The offending file and line are encoded in the __bug_table section. * The offending file and line are encoded in the __bug_table section.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment