1. 07 2月, 2008 33 次提交
  2. 06 2月, 2008 7 次提交
    • P
      Merge branch 'for-2.6.25' of... · b370b082
      Paul Mackerras 提交于
      Merge branch 'for-2.6.25' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into for-2.6.25
      b370b082
    • J
      [POWERPC] arch/powerpc/platforms/82xx: Add missing of_node_put · 75e89b02
      Julia Lawall 提交于
      Of_get_parent and of_find_compatible_node do a of_node_get, and thus a
      corresponding of_code_put is needed in both the error case and the normal
      return case.
      
      The problem was found using the following semantic match.
      (http://www.emn.fr/x-info/coccinelle/)
      
      // <smpl>
      @@
      type T,T1,T2;
      identifier E;
      statement S;
      expression x1,x2,x3;
      int ret;
      @@
      
        T E;
        ...
      * E = \(of_get_parent\|of_find_compatible_node\)(...);
        if (E == NULL) S
        ... when != of_node_put(...,(T1)E,...)
            when != if (E != NULL) { ... of_node_put(...,(T1)E,...); ...}
            when != x1 = (T1)E
            when != E = x3;
            when any
        if (...) {
          ... when != of_node_put(...,(T2)E,...)
              when != if (E != NULL) { ... of_node_put(...,(T2)E,...); ...}
              when != x2 = (T2)E
      (
      *   return;
      |
      *   return ret;
      )
        }
      // </smpl>
      Signed-off-by: NJulia Lawall <julia@diku.dk>
      Cc: Stephen Rothwell <sfr@canb.auug.org.au>
      Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
      Cc: Paul Mackerras <paulus@samba.org>
      Cc: Kumar Gala <galak@gate.crashing.org>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NPaul Mackerras <paulus@samba.org>
      75e89b02
    • J
      [POWERPC] arch/powerpc/sysdev: Add missing of_node_put · b1725c93
      Julia Lawall 提交于
      The functions of_find_compatible_node and of_find_node_by_type both
      call of_node_get on their result.  So any error handling code
      thereafter should call of_node_put(np).  This is taken care of in the
      case where there is a goto out, but not when there is a direct return.
      
      The function irq_alloc_host puts np into the returned structure, which is
      stored in the global variable mpc8xx_pic_host, so the reference count
      should be set for the lifetime of that variable.  The current solution ups
      the reference count again in the argument to irq_alloc_host so that it can
      be decremented on the way out.  This seems a bit unnecessary, and also
      doesn't work in the case where irq_alloc_host fails, because then the
      reference count only goes does by one, whereas it should go down by two.  A
      better solution is to not increment the reference count in the argument to
      irq_alloc_host and only decrement it on the way out in an error case.
      
      The problem was found using the following semantic match.
      (http://www.emn.fr/x-info/coccinelle/)
      
      // <smpl>
      @@
      type T,T1,T2;
      identifier E;
      statement S;
      expression x1,x2,x3;
      int ret;
      @@
      
        T E;
        ...
      * E = \(of_get_parent\|of_find_compatible_node\)(...);
        if (E == NULL) S
        ... when != of_node_put(...,(T1)E,...)
            when != if (E != NULL) { ... of_node_put(...,(T1)E,...); ...}
            when != x1 = (T1)E
            when != E = x3;
            when any
        if (...) {
          ... when != of_node_put(...,(T2)E,...)
              when != if (E != NULL) { ... of_node_put(...,(T2)E,...); ...}
              when != x2 = (T2)E
      (
      *   return;
      |
      *   return ret;
      )
        }
      // </smpl>
      Signed-off-by: NJulia Lawall <julia@diku.dk>
      Cc: Stephen Rothwell <sfr@canb.auug.org.au>
      Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
      Cc: Kumar Gala <galak@gate.crashing.org>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NPaul Mackerras <paulus@samba.org>
      b1725c93
    • J
      [POWERPC] arch/powerpc/platforms/pseries: Add missing of_node_put · 842decbd
      Julia Lawall 提交于
      Of_get_parent and of_find_compatible_node do an of_node_get, and thus a
      corresponding of_code_put is needed in the error case.
      
      The problem was found using the following semantic match.
      (http://www.emn.fr/x-info/coccinelle/)
      
      // <smpl>
      @@
      type T,T1,T2;
      identifier E;
      statement S;
      expression x1,x2,x3;
      int ret;
      @@
      
        T E;
        ...
      * E = \(of_get_parent\|of_find_compatible_node\)(...);
        if (E == NULL) S
        ... when != of_node_put(...,(T1)E,...)
            when != if (E != NULL) { ... of_node_put(...,(T1)E,...); ...}
            when != x1 = (T1)E
            when != E = x3;
            when any
        if (...) {
          ... when != of_node_put(...,(T2)E,...)
              when != if (E != NULL) { ... of_node_put(...,(T2)E,...); ...}
              when != x2 = (T2)E
      (
      *   return;
      |
      *   return ret;
      )
        }
      // </smpl>
      Signed-off-by: NJulia Lawall <julia@diku.dk>
      Cc: Stephen Rothwell <sfr@canb.auug.org.au>
      Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
      Cc: Kumar Gala <galak@gate.crashing.org>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NPaul Mackerras <paulus@samba.org>
      842decbd
    • K
      [POWERPC] 85xx: Add second cpu to 8572 dts · 7e25867f
      Kumar Gala 提交于
      The 8572 is a dual core processor, not reason not to describe both
      cores in the device tree.
      Signed-off-by: NKumar Gala <galak@kernel.crashing.org>
      7e25867f
    • A
      [POWERPC] qe_lib: fix few fluffy negligences · d8985fd2
      Anton Vorontsov 提交于
      One is intoduced by me (of_node_put() absence) and another was
      present already (not checking for NULL).
      
      Found by Stephen Rothwell.
      Signed-off-by: NAnton Vorontsov <avorontsov@ru.mvista.com>
      Acked-by: NStephen Rothwell <sfr@canb.auug.org.au>
      Signed-off-by: NKumar Gala <galak@kernel.crashing.org>
      d8985fd2
    • K
      [POWERPC] 83xx: Update mpc83xx_defconfig · e1664ee9
      Kim Phillips 提交于
      Enable math emulation and ucc_geth and some PHYs mpc83xx boards use.
      Signed-off-by: NKim Phillips <kim.phillips@freescale.com>
      Signed-off-by: NKumar Gala <galak@kernel.crashing.org>
      e1664ee9