ppc64: merge some updates from 2.4

diff --git a/arch/ppc64/kernel/mf.c b/arch/ppc64/kernel/mf.c
index a9df22dbc17357a57655226ca754a2be4f78012e..3999ea9ee8133a414263239527f79fe42dcde64c 100644 (file)
--- a/arch/ppc64/kernel/mf.c
+++ b/arch/ppc64/kernel/mf.c
@@ -410,7 +410,7 @@ static int shutdown( void )
                mf_powerOff();
        }
        else
-               printk( KERN_ALERT "mf.c: init has been successfully notified to proceed with shutdown\n" );
+               printk( KERN_INFO "mf.c: init has been successfully notified to proceed with shutdown\n" );
 
        return rc;
 }
@@ -436,7 +436,7 @@ static void intReceived( struct IoMFLpEvent * event )
                case 0x5B:      /* power control notification */
                        if ( (event->xUnion.xCEMsgData.xCEMsg[5]&0x20) != 0 )
                        {
-                               printk( KERN_ALERT "mf.c: Commencing partition shutdown\n" );
+                               printk( KERN_INFO "mf.c: Commencing partition shutdown\n" );
                                if ( shutdown() == 0 )
                                        signalCEMsg( "\x00\x00\x00\xDB\x00\x00\x00\x00\x00\x00\x00\x00", NULL );
                        }
@@ -479,7 +479,7 @@ static void intReceived( struct IoMFLpEvent * event )
                        signalEvent( NULL );
                break;
        case 1: /* IT sys shutdown */
-               printk( KERN_ALERT "mf.c: Commencing system shutdown\n" );
+               printk( KERN_INFO "mf.c: Commencing system shutdown\n" );
                shutdown();
                break;
        }
@@ -666,7 +666,7 @@ void mf_deallocateLpEvents( HvLpIndex targetLp,
  */
 void mf_powerOff( void )
 {
-       printk( KERN_ALERT "mf.c: Down it goes...\n" );
+       printk( KERN_INFO "mf.c: Down it goes...\n" );
        signalCEMsg( "\x00\x00\x00\x4D\x00\x00\x00\x00\x00\x00\x00\x00", NULL );
        for (;;);
 }
@@ -677,7 +677,7 @@ void mf_powerOff( void )
  */
 void mf_reboot( void )
 {
-       printk( KERN_ALERT "mf.c: Preparing to bounce...\n" );
+       printk( KERN_INFO "mf.c: Preparing to bounce...\n" );
        signalCEMsg( "\x00\x00\x00\x4E\x00\x00\x00\x00\x00\x00\x00\x00", NULL );
        for (;;);
 }

diff --git a/arch/ppc64/kernel/pci.c b/arch/ppc64/kernel/pci.c
index 7766da6abf41a39a272ba9e08997f108bdd2f449..0af5f9d11a13d57af3788118295293a2f5bf1ecf 100644 (file)
--- a/arch/ppc64/kernel/pci.c
+++ b/arch/ppc64/kernel/pci.c
@@ -46,6 +46,7 @@ unsigned long pci_io_base     = 0;
 static void pcibios_fixup_resources(struct pci_dev* dev);
 static void fixup_broken_pcnet32(struct pci_dev* dev);
 static void fixup_windbond_82c105(struct pci_dev* dev);
+void fixup_resources(struct pci_dev* dev);
 
 void   iSeries_pcibios_init(void);
 void   pSeries_pcibios_init(void);

diff --git a/include/asm-ppc64/hvcall.h b/include/asm-ppc64/hvcall.h
index 47671fc2e26d39ba89c0065217c9d74173183929..cfbdf78de62c6a98e6edb133df60e1802f1051d3 100644 (file)
--- a/include/asm-ppc64/hvcall.h
+++ b/include/asm-ppc64/hvcall.h
@@ -57,6 +57,7 @@
 #define H_IPI                  0x6c
 #define H_IPOLL                        0x70
 #define H_XIRR                 0x74
+#define H_PERFMON              0x7c
 
 #define HSC                    ".long 0x44000022\n"
 #define H_ENTER_r3             "li     3, 0x08\n"

diff --git a/include/asm-ppc64/iSeries/HvCall.h b/include/asm-ppc64/iSeries/HvCall.h
index dfa28eba4e51d65fa024464e1b7fc81b765931cc..824bf531c6715ae3a50a40b8470d4d91a8f344b1 100644 (file)
--- a/include/asm-ppc64/iSeries/HvCall.h
+++ b/include/asm-ppc64/iSeries/HvCall.h
@@ -130,6 +130,7 @@ enum HvCall_VaryOffChunkRc
 #define HvCallBaseRouter28                             HvCallBase + 28
 #define HvCallBaseRouter29                             HvCallBase + 29
 #define HvCallBaseRouter30                             HvCallBase + 30
+#define HvCallBaseSetDebugBus                          HvCallBase + 31
 
 #define HvCallCcSetDABR                                HvCallCc + 7
 
@@ -205,5 +206,10 @@ static inline void HvCall_setDABR(unsigned long val)
        HvCall1(HvCallCcSetDABR, val);
 }
 
+static inline void HvCall_setDebugBus(unsigned long val)
+{
+       HvCall1(HvCallBaseSetDebugBus, val);
+}
+
 #endif // _HVCALL_H