diff options
author | Frans Meulenbroeks <fransmeulenbroeks@yahoo.com> | 2006-06-09 13:20:35 +0000 |
---|---|---|
committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-06-09 13:20:35 +0000 |
commit | c7f3725d8ab361dd85077638ba965481a80ba526 (patch) | |
tree | 34209e18ea8027ea07c5643f79aaddf61b5e459c /packages/ixp4xx | |
parent | 1cc09b95f77efec4d13dcef009001cd679782398 (diff) | |
parent | ddae6ed3a6109db5116f1306c56de5d8d550c084 (diff) |
merge of 482d0ac7ec1cff34c9fc7affc4b051abafb85e03
and df1198a3d060cad27956be1a6653a6556adfe9dd
Diffstat (limited to 'packages/ixp4xx')
-rw-r--r-- | packages/ixp4xx/ixp4xx-csr-2.1/livelock.patch | 19 | ||||
-rw-r--r-- | packages/ixp4xx/ixp4xx-csr_2.1.bb | 3 |
2 files changed, 21 insertions, 1 deletions
diff --git a/packages/ixp4xx/ixp4xx-csr-2.1/livelock.patch b/packages/ixp4xx/ixp4xx-csr-2.1/livelock.patch new file mode 100644 index 0000000000..0b4e4ba026 --- /dev/null +++ b/packages/ixp4xx/ixp4xx-csr-2.1/livelock.patch @@ -0,0 +1,19 @@ +*** ixp400_xscale_sw/src/oslinux/IxLinuxInit.c.orig Sun Sep 25 05:59:03 2005 +--- ixp400_xscale_sw/src/oslinux/IxLinuxInit.c Fri Jun 9 14:07:06 2006 +*************** +*** 91,97 **** + + + /* Module parameters */ +! static int livelock_dispatcher = 0;/* default: don't use livelock dispatcher*/ + + MODULE_PARM(livelock_dispatcher, "i"); + MODULE_PARM_DESC(livelock_dispatcher, "If non-zero, use the livelock prevention qmgr dispatcher"); +--- 91,97 ---- + + + /* Module parameters */ +! int livelock_dispatcher = 0;/* default: don't use livelock dispatcher*/ + + MODULE_PARM(livelock_dispatcher, "i"); + MODULE_PARM_DESC(livelock_dispatcher, "If non-zero, use the livelock prevention qmgr dispatcher"); diff --git a/packages/ixp4xx/ixp4xx-csr_2.1.bb b/packages/ixp4xx/ixp4xx-csr_2.1.bb index 53cd2ba8fb..567728b40f 100644 --- a/packages/ixp4xx/ixp4xx-csr_2.1.bb +++ b/packages/ixp4xx/ixp4xx-csr_2.1.bb @@ -35,10 +35,11 @@ SRC_URI += "file://mii-debug.patch;patch=1" SRC_URI += "file://rtl8201-support.patch;patch=1" SRC_URI += "file://gcc4.patch;patch=1" SRC_URI += "file://oe-makefile.patch;patch=1" +SRC_URI += "file://livelock.patch;patch=1" DEPENDS = "ixp-osal" S = "${WORKDIR}/ixp400_xscale_sw" -PR = "r9" +PR = "r10" COMPATIBLE_HOST = "^arm.*-linux.*" |