- fix orc_dump build on x32

[packages/kernel.git] / kernel-small_fixes.patch

diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch
index 9b809da2c299549c8830af6df1b202593eafc761..81d01fa5d8010ed2deeb2a05f0564b6b4925f757 100644 (file)
--- a/kernel-small_fixes.patch
+++ b/kernel-small_fixes.patch
@@ -27,53 +27,47 @@
                        fi
                done
 
-diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
-index 7a0c800..ec5ebbb 100644
---- a/drivers/net/ethernet/realtek/r8169.c
-+++ b/drivers/net/ethernet/realtek/r8169.c
-@@ -4103,6 +4103,14 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
-       /* Get MAC address */
-       for (i = 0; i < ETH_ALEN; i++)
-               dev->dev_addr[i] = RTL_R8(MAC0 + i);
-+
-+      if (!is_valid_ether_addr(dev->dev_addr)) {
-+              /* Report it and use a random ethernet address instead */
-+              netdev_err(dev, "Invalid MAC address: %pM\n", dev->dev_addr);
-+              random_ether_addr(dev->dev_addr);
-+              netdev_info(dev, "Using random MAC address: %pM\n",
-+                          dev->dev_addr);
-+      }
-       memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
+; kernel-orc.patch
+Index: linux-2.6/tools/objtool/orc_dump.c
+===================================================================
+--- linux-2.6.orig/tools/objtool/orc_dump.c
++++ linux-2.6/tools/objtool/orc_dump.c
+@@ -76,7 +76,8 @@ int orc_dump(const char *_objname)
+       int fd, nr_entries, i, *orc_ip = NULL, orc_size = 0;
+       struct orc_entry *orc = NULL;
+       char *name;
+-      unsigned long nr_sections, orc_ip_addr = 0;
++      size_t nr_sections;
++      Elf64_Addr orc_ip_addr = 0;
+       size_t shstrtab_idx;
+       Elf *elf;
+       Elf_Scn *scn;
+@@ -187,10 +188,10 @@ int orc_dump(const char *_objname)
+                               return -1;
+                       }
  
-       SET_ETHTOOL_OPS(dev, &rtl8169_ethtool_ops);
--- 
-1.7.7.3
-
-  
---- linux-3.4/fs/unionfs/commonfops.c.org      2012-05-29 20:40:20.756489877 +0200
-+++ linux-3.4/fs/unionfs/commonfops.c  2012-05-29 21:07:12.021252743 +0200
-@@ -766,7 +766,7 @@
-                                  unsigned int cmd, unsigned long arg)
- {
-       int err = 0;
--      fd_set branchlist;
-+      unsigned long branchlist = 0;
-       int bstart = 0, bend = 0, bindex = 0;
-       int orig_bstart, orig_bend;
-       struct dentry *dentry, *lower_dentry;
-@@ -781,14 +781,12 @@
-       bstart = dbstart(dentry);
-       bend = dbend(dentry);
+-                      printf("%s+%lx:", name, rela.r_addend);
++                      printf("%s+%llx:", name, (unsigned long long)rela.r_addend);
+ 
+               } else {
+-                      printf("%lx:", orc_ip_addr + (i * sizeof(int)) + orc_ip[i]);
++                      printf("%llx:", (unsigned long long)(orc_ip_addr + (i * sizeof(int)) + orc_ip[i]));
+               }
+ 
+ 
+Index: linux-2.6/tools/objtool/Makefile
+===================================================================
+--- linux-2.6.orig/tools/objtool/Makefile
++++ linux-2.6/tools/objtool/Makefile
+@@ -7,8 +7,9 @@ ARCH := x86
+ endif
+ 
+ # always use the host compiler
+-CC = gcc
+-LD = ld
++CC = $(HOSTCC)
++HOSTLD ?= ld
++LD = $(HOSTLD)
+ AR = ar
  
--      FD_ZERO(&branchlist);
--
-       for (bindex = bstart; bindex <= bend; bindex++) {
-               lower_dentry = unionfs_lower_dentry_idx(dentry, bindex);
-               if (!lower_dentry)
-                       continue;
-               if (likely(lower_dentry->d_inode))
--                      FD_SET(bindex, &branchlist);
-+                      __set_bit(bindex, &branchlist);
-               /* purge any lower objects after partial_lookup */
-               if (bindex < orig_bstart || bindex > orig_bend) {
-                       dput(lower_dentry);
+ ifeq ($(srctree),)