synway
/
spbx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
spbx/roms/srcs/images/linux-mpc8309/mpc8309_linux_kernel.diff

213 lines
7.2 KiB
Diff
Raw Permalink Blame History

diff -Naur -x conf .swap_kernel/.config linux-2.6.34-base/.config
--- .swap_kernel/.config 2014-03-23 11:40:10.949962565 +0800
+++ linux-2.6.34-base/.config 2014-02-24 08:50:25.624990403 +0800
@@ -315,7 +315,7 @@
# CONFIG_PPC_16K_PAGES is not set
# CONFIG_PPC_64K_PAGES is not set
# CONFIG_PPC_256K_PAGES is not set
-CONFIG_FORCE_MAX_ZONEORDER=16
+CONFIG_FORCE_MAX_ZONEORDER=11
CONFIG_PROC_DEVICETREE=y
# CONFIG_CMDLINE_BOOL is not set
CONFIG_EXTRA_TARGETS=""
diff -Naur -x conf .swap_kernel/drivers/i2c/busses/i2c-mpc.c linux-2.6.34-base/drivers/i2c/busses/i2c-mpc.c
--- .swap_kernel/drivers/i2c/busses/i2c-mpc.c 2014-03-23 11:40:51.207962534 +0800
+++ linux-2.6.34-base/drivers/i2c/busses/i2c-mpc.c 2014-02-24 08:51:32.084990344 +0800
@@ -489,16 +489,6 @@
int ret = 0;
unsigned long orig_jiffies = jiffies;
struct mpc_i2c *i2c = i2c_get_adapdata(adap);
-#if 0
- writeccr(i2c, 0);
- udelay(30);
- writeccr(i2c, CCR_MEN);
- udelay(30);
- writeccr(i2c, CCR_MSTA | CCR_MTX);
- udelay(30);
-#else
- mpc_i2c_fixup(i2c);
-#endif
mpc_i2c_start(i2c);
diff -Naur -x conf .swap_kernel/include/config/auto.conf linux-2.6.34-base/include/config/auto.conf
--- .swap_kernel/include/config/auto.conf 2014-03-23 11:40:12.093962565 +0800
+++ linux-2.6.34-base/include/config/auto.conf 2014-02-24 08:50:27.197990387 +0800
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.34
-# Wed Mar 5 15:41:46 2014
+# Wed Jan 8 14:53:25 2014
#
CONFIG_FRAME_WARN=1024
CONFIG_MPC8309_SOM=y
@@ -303,7 +303,7 @@
CONFIG_PHYLIB=y
CONFIG_SYSFS_DEPRECATED=y
CONFIG_SPI_MPC8xxx=m
-CONFIG_FORCE_MAX_ZONEORDER=16
+CONFIG_FORCE_MAX_ZONEORDER=11
CONFIG_TASK_SIZE=0xc0000000
CONFIG_NFS_V3=y
CONFIG_PPC_INDIRECT_PCI=y
diff -Naur -x conf .swap_kernel/include/generated/autoconf.h linux-2.6.34-base/include/generated/autoconf.h
--- .swap_kernel/include/generated/autoconf.h 2014-03-23 11:40:12.391962559 +0800
+++ linux-2.6.34-base/include/generated/autoconf.h 2014-02-24 08:50:27.423990387 +0800
@@ -1,7 +1,7 @@
/*
* Automatically generated C config: don't edit
* Linux kernel version: 2.6.34
- * Wed Mar 5 15:41:46 2014
+ * Wed Jan 8 14:53:25 2014
*/
#define AUTOCONF_INCLUDED
#define CONFIG_FRAME_WARN 1024
@@ -304,7 +304,7 @@
#define CONFIG_PHYLIB 1
#define CONFIG_SYSFS_DEPRECATED 1
#define CONFIG_SPI_MPC8xxx_MODULE 1
-#define CONFIG_FORCE_MAX_ZONEORDER 16
+#define CONFIG_FORCE_MAX_ZONEORDER 11
#define CONFIG_TASK_SIZE 0xc0000000
#define CONFIG_NFS_V3 1
#define CONFIG_PPC_INDIRECT_PCI 1
diff -Naur -x conf .swap_kernel/include/generated/compile.h linux-2.6.34-base/include/generated/compile.h
--- .swap_kernel/include/generated/compile.h 2014-03-23 11:40:12.398962564 +0800
+++ linux-2.6.34-base/include/generated/compile.h 2014-02-24 08:50:27.434990386 +0800
@@ -1,11 +1,11 @@
-/* This file is auto generated, version 164 */
+/* This file is auto generated, version 143 */
/* PREEMPT */
#define UTS_MACHINE "ppc"
-#define UTS_VERSION "#164 PREEMPT Thu Mar 20 15:49:21 CST 2014"
-#define LINUX_COMPILE_TIME "15:49:21"
-#define LINUX_COMPILE_MAJOR "20140320"
-#define LINUX_COMPILE_SUB "154921"
-#define LINUX_MAKE_VERSION (164)
+#define UTS_VERSION "#143 PREEMPT Tue Feb 18 16:13:05 CST 2014"
+#define LINUX_COMPILE_TIME "16:13:05"
+#define LINUX_COMPILE_MAJOR "20140218"
+#define LINUX_COMPILE_SUB "161305"
+#define LINUX_MAKE_VERSION (143)
#define LINUX_COMPILE_BY "hx"
#define LINUX_COMPILE_HOST "CentOS.HX"
#define LINUX_COMPILE_DOMAIN
diff -Naur -x conf .swap_kernel/Module.symvers linux-2.6.34-base/Module.symvers
--- .swap_kernel/Module.symvers 2014-03-23 11:40:11.824962565 +0800
+++ linux-2.6.34-base/Module.symvers 2014-02-24 08:50:26.819990386 +0800
@@ -1613,7 +1613,6 @@
0x00000000 pci_enable_rom vmlinux EXPORT_SYMBOL_GPL
0x00000000 __bitmap_complement vmlinux EXPORT_SYMBOL
0x00000000 memdup_user vmlinux EXPORT_SYMBOL
-0x00000000 devinet_ioctl vmlinux EXPORT_SYMBOL
0x00000000 dma_get_required_mask vmlinux EXPORT_SYMBOL_GPL
0x00000000 del_timer vmlinux EXPORT_SYMBOL
0x00000000 map_destroy vmlinux EXPORT_SYMBOL
diff -Naur -x conf .swap_kernel/net/core/iovec.c linux-2.6.34-base/net/core/iovec.c
--- .swap_kernel/net/core/iovec.c 2014-03-23 11:40:43.645962544 +0800
+++ linux-2.6.34-base/net/core/iovec.c 2014-02-24 08:51:23.749990349 +0800
@@ -165,14 +165,8 @@
offset = 0;
if (copy_from_user(kdata, base, copy))
{
- if(iov->iov_len == 76)
- {
- memcpy(kdata, base, copy);
- }
- else
- {
- return -EFAULT;
- }
+ printk("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!Net Error Message\n");
+ return -EFAULT;
}
len -= copy;
kdata += copy;
@@ -251,17 +245,7 @@
csum = csum_and_copy_from_user(base, kdata, copy,
csum, &err);
if (err)
- {
- if(iov->iov_len == 76)
- {
- memcpy(kdata, base, copy);
- err = 0;
- }
- else
- {
- goto out;
- }
- }
+ goto out;
}
len -= copy + partial_cnt;
kdata += copy + partial_cnt;
diff -Naur -x conf .swap_kernel/net/ipv4/devinet.c linux-2.6.34-base/net/ipv4/devinet.c
--- .swap_kernel/net/ipv4/devinet.c 2014-03-23 11:40:46.432962542 +0800
+++ linux-2.6.34-base/net/ipv4/devinet.c 2014-02-24 08:51:26.182990350 +0800
@@ -821,7 +821,6 @@
ret = copy_to_user(arg, &ifr, sizeof(struct ifreq)) ? -EFAULT : 0;
goto out;
}
-EXPORT_SYMBOL(devinet_ioctl);
static int inet_gifconf(struct net_device *dev, char __user *buf, int len)
{
diff -Naur -x conf .swap_kernel/net/ipv4/ip_output.c linux-2.6.34-base/net/ipv4/ip_output.c
--- .swap_kernel/net/ipv4/ip_output.c 2014-03-23 11:40:46.507962544 +0800
+++ linux-2.6.34-base/net/ipv4/ip_output.c 2014-02-24 08:51:26.273990334 +0800
@@ -698,15 +698,11 @@
if (skb->ip_summed == CHECKSUM_PARTIAL) {
if (memcpy_fromiovecend(to, iov, offset, len) < 0)
- {
return -EFAULT;
- }
} else {
__wsum csum = 0;
if (csum_partial_copy_fromiovecend(to, iov, offset, len, &csum) < 0)
- {
return -EFAULT;
- }
skb->csum = csum_block_add(skb->csum, csum, odd);
}
return 0;
@@ -868,9 +864,7 @@
length + fragheaderlen <= mtu &&
rt->u.dst.dev->features & NETIF_F_V4_CSUM &&
!exthdrlen)
- {
csummode = CHECKSUM_PARTIAL;
- }
inet->cork.length += length;
if (((length> mtu) || !skb_queue_empty(&sk->sk_write_queue)) &&
@@ -988,7 +982,7 @@
if (copy > 0 && getfrag(from, data + transhdrlen, offset, copy, fraggap, skb) < 0) {
err = -EFAULT;
kfree_skb(skb);
- printk("xxxx %s:%d err:%u, copy:%d\n",__FILE__,__LINE__,-EFAULT, copy);
+ printk("xxxx %s:%d err:%u\n",__FILE__,__LINE__,-EFAULT);
goto error;
}
diff -Naur -x conf .swap_kernel/net/ipv4/udp.c linux-2.6.34-base/net/ipv4/udp.c
--- .swap_kernel/net/ipv4/udp.c 2014-03-23 11:40:46.449962544 +0800
+++ linux-2.6.34-base/net/ipv4/udp.c 2014-02-24 08:51:26.193990349 +0800
@@ -951,7 +951,7 @@
sizeof(struct udphdr), &ipc, &rt,
corkreq ? msg->msg_flags|MSG_MORE : msg->msg_flags);
if (err) {
- printk("xxxx %s:%d err:%u(%d)\n",__FILE__,__LINE__,err, is_udplite);
+ printk("xxxx %s:%d err:%u\n",__FILE__,__LINE__,err);
udp_flush_pending_frames(sk);
}
else if (!corkreq)
diff -Naur -x conf .swap_kernel/.version linux-2.6.34-base/.version
--- .swap_kernel/.version 2014-03-23 11:40:13.676962563 +0800
+++ linux-2.6.34-base/.version 2014-02-24 08:50:28.207990386 +0800
@@ -1 +1 @@
-164
+143
Reference in New Issue View Git Blame Copy Permalink