Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

Conflicts:
	drivers/staging/Kconfig
	drivers/staging/Makefile
	drivers/staging/cpc-usb/TODO
	drivers/staging/cpc-usb/cpc-usb_drv.c
	drivers/staging/cpc-usb/cpc.h
	drivers/staging/cpc-usb/cpc_int.h
	drivers/staging/cpc-usb/cpcusb.h

1 files changed, 3 insertions, 3 deletions

diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c
index c557f1fb1c66..612dc878e05c 100644
--- a/net/sctp/protocol.c
+++ b/net/sctp/protocol.c
@@ -1184,10 +1184,10 @@ SCTP_STATIC __init int sctp_init(void)
         /* Size and allocate the association hash table.
          * The methodology is similar to that of the tcp hash tables.
          */
-        if (num_physpages >= (128 * 1024))
-                goal = num_physpages >> (22 - PAGE_SHIFT);
+        if (totalram_pages >= (128 * 1024))
+                goal = totalram_pages >> (22 - PAGE_SHIFT);
         else
-                goal = num_physpages >> (24 - PAGE_SHIFT);
+                goal = totalram_pages >> (24 - PAGE_SHIFT);
 
         for (order = 0; (1UL << order) < goal; order++)
                 ;