Revert "aufs: Do not refer to AUFS_NAME in pr_fmt (fixes FTBFS on m68k)"
This is not sufficient to fix the failure. svn path=/dists/sid/linux-2.6/; revision=18444
This commit is contained in:
parent
3206cefe45
commit
3cc9ce52b2
|
@ -14,7 +14,6 @@ linux-2.6 (3.1.6-2) UNRELEASED; urgency=low
|
||||||
(Closes: #653716)
|
(Closes: #653716)
|
||||||
* Revert "clockevents: Set noop handler in clockevents_exchange_device()",
|
* Revert "clockevents: Set noop handler in clockevents_exchange_device()",
|
||||||
included in stable update 3.1.5 (Closes: #653398)
|
included in stable update 3.1.5 (Closes: #653398)
|
||||||
* aufs: Do not refer to AUFS_NAME in pr_fmt (fixes FTBFS on m68k)
|
|
||||||
|
|
||||||
[ Jonathan Nieder ]
|
[ Jonathan Nieder ]
|
||||||
* prerm: Print an error message when aborting removal of the running
|
* prerm: Print an error message when aborting removal of the running
|
||||||
|
|
|
@ -1,29 +0,0 @@
|
||||||
From 7df99f5adbc370a6494cb68890dacff3227b0f04 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Ben Hutchings <ben@decadent.org.uk>
|
|
||||||
Date: Fri, 30 Dec 2011 17:58:57 +0100
|
|
||||||
Subject: [PATCH] aufs: Do not refer to AUFS_NAME in pr_fmt
|
|
||||||
|
|
||||||
AUFS_NAME is only defined in aufs_type.h but pr_fmt may be used in
|
|
||||||
headers included before aufs_type.h.
|
|
||||||
|
|
||||||
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
|
|
||||||
---
|
|
||||||
fs/aufs/Makefile | 2 +-
|
|
||||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/fs/aufs/Makefile b/fs/aufs/Makefile
|
|
||||||
index 58ad988..9594b8a 100644
|
|
||||||
--- a/fs/aufs/Makefile
|
|
||||||
+++ b/fs/aufs/Makefile
|
|
||||||
@@ -5,7 +5,7 @@ include ${srctree}/${src}/magic.mk
|
|
||||||
# enable pr_debug
|
|
||||||
ccflags-y += -DDEBUG
|
|
||||||
# sparse doesn't allow spaces
|
|
||||||
-ccflags-y += -D'pr_fmt(fmt)=AUFS_NAME"\040%s:%d:%s[%d]:\040"fmt,__func__,__LINE__,current->comm,current->pid'
|
|
||||||
+ccflags-y += -D'pr_fmt(fmt)="aufs\040%s:%d:%s[%d]:\040"fmt,__func__,__LINE__,current->comm,current->pid'
|
|
||||||
|
|
||||||
obj-$(CONFIG_AUFS_FS) += aufs.o
|
|
||||||
aufs-y := module.o sbinfo.o super.o branch.o xino.o sysaufs.o opts.o \
|
|
||||||
--
|
|
||||||
1.7.7.3
|
|
||||||
|
|
|
@ -14,7 +14,6 @@
|
||||||
+ features/all/aufs3/aufs3-add.patch
|
+ features/all/aufs3/aufs3-add.patch
|
||||||
# mark as staging/crap
|
# mark as staging/crap
|
||||||
+ features/all/aufs3/mark-as-staging.patch
|
+ features/all/aufs3/mark-as-staging.patch
|
||||||
+ bugfix/all/aufs-Do-not-refer-to-AUFS_NAME-in-pr_fmt.patch
|
|
||||||
|
|
||||||
+ bugfix/ia64/hardcode-arch-script-output.patch
|
+ bugfix/ia64/hardcode-arch-script-output.patch
|
||||||
+ bugfix/mips/disable-advansys.patch
|
+ bugfix/mips/disable-advansys.patch
|
||||||
|
|
Loading…
Reference in New Issue