Hi Linus,

Please pull from 'for-linus' branch of

master.kernel.org:/pub/scm/linux/kernel/git/cooloney/blackfin-2.6.git for-linus

to receive the following updates:

 arch/blackfin/mach-common/pm.c              |    6 ++
 include/asm-blackfin/mach-bf561/cdefBF561.h |    4 +-
 include/asm-blackfin/string.h               |  129 +++++++++++++++++----------
 3 files changed, 88 insertions(+), 51 deletions(-)

Michael Hennerich (1):
      Blackfin arch: Update/Fix PM support add new pm_ops valid

Mike Frysinger (1):
      Blackfin arch: fix some bugs in lib/string.h functions found by our string testing modules

Robin Getz (1):
      Blackfin arch: fix the aliased write macros

diff --git a/arch/blackfin/mach-common/pm.c b/arch/blackfin/mach-common/pm.c
index 1772d8d..b103027 100644
--- a/arch/blackfin/mach-common/pm.c
+++ b/arch/blackfin/mach-common/pm.c
@@ -158,10 +158,16 @@ static int bfin_pm_finish(suspend_state_t state)
 	return 0;
 }
 
+static int bfin_pm_valid(suspend_state_t state)
+{
+	return (state == PM_SUSPEND_STANDBY);
+}
+
 struct pm_ops bfin_pm_ops = {
 	.prepare = bfin_pm_prepare,
 	.enter = bfin_pm_enter,
 	.finish = bfin_pm_finish,
+	.valid	= bfin_pm_valid,
 };
 
 static int __init bfin_pm_init(void)
diff --git a/include/asm-blackfin/mach-bf561/cdefBF561.h b/include/asm-blackfin/mach-bf561/cdefBF561.h
index 6e87ab2..73d4d65 100644
--- a/include/asm-blackfin/mach-bf561/cdefBF561.h
+++ b/include/asm-blackfin/mach-bf561/cdefBF561.h
@@ -83,9 +83,9 @@ static __inline__ void bfin_write_VR_CTL(unsigned int val)
 
 /* For MMR's that are reserved on Core B, set up defines to better integrate with other ports */
 #define bfin_read_SWRST()                    bfin_read_SICA_SWRST()
-#define bfin_write_SWRST()                   bfin_write_SICA_SWRST()
+#define bfin_write_SWRST(val)                bfin_write_SICA_SWRST(val)
 #define bfin_read_SYSCR()                    bfin_read_SICA_SYSCR()
-#define bfin_write_SYSCR()                   ...
[ message continues ]

btw. what about this error?

fs/binfmt_flat.c:760:50: error: macro "flat_get_addr_from_rp" requires 4 
arguments, but only 3 given
fs/binfmt_flat.c:760: error: ‘flat_get_addr_from_rp’ undeclared (first use in 
this function)
fs/binfmt_flat.c:760: error: (Each undeclared identifier is reported only once
fs/binfmt_flat.c:760: error: for each function it appears in.)
make[2]: *** [fs/binfmt_flat.o] Error 1
make[1]: *** [fs] Error 2
make: *** [_all] Error 2

any chance to get that fixed prior to .23? (not a regression, but
happens approx. since blackfin was merged)

Thanks,

Jan

Full build log: http://l4x.org/k/?d=34032
-

[ message continues ]

This is because a binfmt_flat hacking patch for Blackfin arch is not
accept by the mainline. It can be workaround by disabling
CONFIG_BINFMT_FLAT in menuconfig.

Need I disable CONFIG_BINFMT_FLAT in defconfigs for Blackfin to make the

Thanks again, beautiful log and which defconfigs do you using to do the
test and what's the toolchain version?

Best Regards
-Bryan Wu
-

[ message continues ]

That would be a workaround, yes. Better would be of course to fix

All information is on the page:

ld-version 2.17
gcc-version 4.1.2 (adi svn)

make HOSTCC=gcc-4.0 ARCH=blackfin CROSS_COMPILE=bfin-elf- CROSS32_COMPILE= 
O=/tmp/tmp.vLOkGP3410/out/blackfin defconfig

Jan
-

[ message continues ]

Did you see someone reject it, or did it just get lost?


Bernd
-- 
This footer brought to you by insane German lawmakers.
Analog Devices GmbH      Wilhelm-Wagenfeld-Str. 6      80807 Muenchen
Sitz der Gesellschaft Muenchen, Registergericht Muenchen HRB 40368
Geschaeftsfuehrer Thomas Wessel, William A. Martin, Margaret Seif
-

[ message continues ]

Actually no one response to the patch. Need I resend it to try again,
-:))?

http://lkml.org/lkml/2007/5/29/24
http://lkml.org/lkml/2007/5/28/63

-Bryan
-

[ message continues ]