]>
Commit | Line | Data |
---|---|---|
08aa9d92 | 1 | --- linux-2.6.33/scripts/mod/modpost.c~ 2010-02-24 19:52:17.000000000 +0100 |
2 | +++ linux-2.6.33/scripts/mod/modpost.c 2010-03-07 14:26:47.242168558 +0100 | |
3 | @@ -15,7 +15,8 @@ | |
4 | #include <stdio.h> | |
5 | #include <ctype.h> | |
6 | #include "modpost.h" | |
7 | -#include "../../include/generated/autoconf.h" | |
8 | +// PLD architectures don't use CONFIG_SYMBOL_PREFIX | |
9 | +//#include "../../include/generated/autoconf.h" | |
10 | #include "../../include/linux/license.h" | |
11 | ||
12 | /* Some toolchains use a `_' prefix for all user symbols. */ | |
13 | ||
2136e199 AM |
14 | --- linux-3.0/scripts/kconfig/lxdialog/check-lxdialog.sh~ 2011-07-22 04:17:23.000000000 +0200 |
15 | +++ linux-3.0/scripts/kconfig/lxdialog/check-lxdialog.sh 2011-08-25 21:26:04.799150642 +0200 | |
16 | @@ -9,6 +9,12 @@ | |
17 | $cc -print-file-name=lib${lib}.${ext} | grep -q / | |
18 | if [ $? -eq 0 ]; then | |
19 | echo "-l${lib}" | |
20 | + for libt in tinfow tinfo ; do | |
21 | + $cc -print-file-name=lib${libt}.${ext} | grep -q / | |
22 | + if [ $? -eq 0 ]; then | |
23 | + echo "-l${libt}" | |
24 | + fi | |
25 | + done | |
26 | exit | |
27 | fi | |
28 | done | |
44c0f99c | 29 | |
59e60efc AM |
30 | diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c |
31 | index 7a0c800..ec5ebbb 100644 | |
32 | --- a/drivers/net/ethernet/realtek/r8169.c | |
33 | +++ b/drivers/net/ethernet/realtek/r8169.c | |
34 | @@ -4103,6 +4103,14 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) | |
35 | /* Get MAC address */ | |
36 | for (i = 0; i < ETH_ALEN; i++) | |
37 | dev->dev_addr[i] = RTL_R8(MAC0 + i); | |
38 | + | |
39 | + if (!is_valid_ether_addr(dev->dev_addr)) { | |
40 | + /* Report it and use a random ethernet address instead */ | |
41 | + netdev_err(dev, "Invalid MAC address: %pM\n", dev->dev_addr); | |
42 | + random_ether_addr(dev->dev_addr); | |
43 | + netdev_info(dev, "Using random MAC address: %pM\n", | |
44 | + dev->dev_addr); | |
45 | + } | |
46 | memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len); | |
47 | ||
48 | SET_ETHTOOL_OPS(dev, &rtl8169_ethtool_ops); | |
49 | -- | |
50 | 1.7.7.3 | |
51 | ||
6a605112 | 52 | |
aca28529 AM |
53 | --- linux-3.4/fs/unionfs/commonfops.c.org 2012-05-29 20:40:20.756489877 +0200 |
54 | +++ linux-3.4/fs/unionfs/commonfops.c 2012-05-29 21:07:12.021252743 +0200 | |
55 | @@ -766,7 +766,7 @@ | |
56 | unsigned int cmd, unsigned long arg) | |
57 | { | |
58 | int err = 0; | |
59 | - fd_set branchlist; | |
60 | + unsigned long branchlist = 0; | |
61 | int bstart = 0, bend = 0, bindex = 0; | |
62 | int orig_bstart, orig_bend; | |
63 | struct dentry *dentry, *lower_dentry; | |
64 | @@ -781,14 +781,12 @@ | |
65 | bstart = dbstart(dentry); | |
66 | bend = dbend(dentry); | |
67 | ||
68 | - FD_ZERO(&branchlist); | |
69 | - | |
70 | for (bindex = bstart; bindex <= bend; bindex++) { | |
71 | lower_dentry = unionfs_lower_dentry_idx(dentry, bindex); | |
72 | if (!lower_dentry) | |
73 | continue; | |
74 | if (likely(lower_dentry->d_inode)) | |
75 | - FD_SET(bindex, &branchlist); | |
76 | + __set_bit(bindex, &branchlist); | |
77 | /* purge any lower objects after partial_lookup */ | |
78 | if (bindex < orig_bstart || bindex > orig_bend) { | |
79 | dput(lower_dentry); |