diff options
author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-03 03:14:09 -0400 |
---|---|---|
committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-03 03:14:09 -0400 |
commit | 27b030d58c8e72fc7a95187a791bd9406e350f02 (patch) | |
tree | ab3bab7f39a5ce5bab65578a7e08fa4dfdeb198c /include/asm-ppc | |
parent | 79d20b14a0d651f15b0ef9a22b6cf12d284a6d38 (diff) | |
parent | 6628465e33ca694bd8fd5c3cf4eb7ff9177bc694 (diff) |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'include/asm-ppc')
-rw-r--r-- | include/asm-ppc/bug.h | 3 | ||||
-rw-r--r-- | include/asm-ppc/pmac_feature.h | 3 | ||||
-rw-r--r-- | include/asm-ppc/reg_booke.h | 1 | ||||
-rw-r--r-- | include/asm-ppc/signal.h | 13 |
4 files changed, 7 insertions, 13 deletions
diff --git a/include/asm-ppc/bug.h b/include/asm-ppc/bug.h index e99c6cb9d618..8b34fd682b0d 100644 --- a/include/asm-ppc/bug.h +++ b/include/asm-ppc/bug.h | |||
@@ -14,6 +14,7 @@ struct bug_entry { | |||
14 | */ | 14 | */ |
15 | #define BUG_WARNING_TRAP 0x1000000 | 15 | #define BUG_WARNING_TRAP 0x1000000 |
16 | 16 | ||
17 | #ifdef CONFIG_BUG | ||
17 | #define BUG() do { \ | 18 | #define BUG() do { \ |
18 | __asm__ __volatile__( \ | 19 | __asm__ __volatile__( \ |
19 | "1: twi 31,0,0\n" \ | 20 | "1: twi 31,0,0\n" \ |
@@ -50,6 +51,8 @@ struct bug_entry { | |||
50 | #define HAVE_ARCH_BUG | 51 | #define HAVE_ARCH_BUG |
51 | #define HAVE_ARCH_BUG_ON | 52 | #define HAVE_ARCH_BUG_ON |
52 | #define HAVE_ARCH_WARN_ON | 53 | #define HAVE_ARCH_WARN_ON |
54 | #endif | ||
55 | |||
53 | #include <asm-generic/bug.h> | 56 | #include <asm-generic/bug.h> |
54 | 57 | ||
55 | #endif | 58 | #endif |
diff --git a/include/asm-ppc/pmac_feature.h b/include/asm-ppc/pmac_feature.h index 639b690ce6f7..8beb162873f4 100644 --- a/include/asm-ppc/pmac_feature.h +++ b/include/asm-ppc/pmac_feature.h | |||
@@ -316,6 +316,9 @@ extern void pmac_register_agp_pm(struct pci_dev *bridge, | |||
316 | extern void pmac_suspend_agp_for_card(struct pci_dev *dev); | 316 | extern void pmac_suspend_agp_for_card(struct pci_dev *dev); |
317 | extern void pmac_resume_agp_for_card(struct pci_dev *dev); | 317 | extern void pmac_resume_agp_for_card(struct pci_dev *dev); |
318 | 318 | ||
319 | /* Used by the via-pmu driver for suspend/resume | ||
320 | */ | ||
321 | extern void pmac_tweak_clock_spreading(int enable); | ||
319 | 322 | ||
320 | /* | 323 | /* |
321 | * The part below is for use by macio_asic.c only, do not rely | 324 | * The part below is for use by macio_asic.c only, do not rely |
diff --git a/include/asm-ppc/reg_booke.h b/include/asm-ppc/reg_booke.h index e70c25f3c339..45c5e6f2b7ab 100644 --- a/include/asm-ppc/reg_booke.h +++ b/include/asm-ppc/reg_booke.h | |||
@@ -305,6 +305,7 @@ do { \ | |||
305 | #define ESR_PIL 0x08000000 /* Program Exception - Illegal */ | 305 | #define ESR_PIL 0x08000000 /* Program Exception - Illegal */ |
306 | #define ESR_PPR 0x04000000 /* Program Exception - Priveleged */ | 306 | #define ESR_PPR 0x04000000 /* Program Exception - Priveleged */ |
307 | #define ESR_PTR 0x02000000 /* Program Exception - Trap */ | 307 | #define ESR_PTR 0x02000000 /* Program Exception - Trap */ |
308 | #define ESR_FP 0x01000000 /* Floating Point Operation */ | ||
308 | #define ESR_DST 0x00800000 /* Storage Exception - Data miss */ | 309 | #define ESR_DST 0x00800000 /* Storage Exception - Data miss */ |
309 | #define ESR_DIZ 0x00400000 /* Storage Exception - Zone fault */ | 310 | #define ESR_DIZ 0x00400000 /* Storage Exception - Zone fault */ |
310 | #define ESR_ST 0x00800000 /* Store Operation */ | 311 | #define ESR_ST 0x00800000 /* Store Operation */ |
diff --git a/include/asm-ppc/signal.h b/include/asm-ppc/signal.h index 8cc8b88d4edd..d890dabd5a69 100644 --- a/include/asm-ppc/signal.h +++ b/include/asm-ppc/signal.h | |||
@@ -99,19 +99,6 @@ typedef struct { | |||
99 | 99 | ||
100 | #define MINSIGSTKSZ 2048 | 100 | #define MINSIGSTKSZ 2048 |
101 | #define SIGSTKSZ 8192 | 101 | #define SIGSTKSZ 8192 |
102 | #ifdef __KERNEL__ | ||
103 | |||
104 | /* | ||
105 | * These values of sa_flags are used only by the kernel as part of the | ||
106 | * irq handling routines. | ||
107 | * | ||
108 | * SA_INTERRUPT is also used by the irq handling routines. | ||
109 | * SA_SHIRQ is for shared interrupt support on PCI and EISA. | ||
110 | */ | ||
111 | #define SA_PROBE SA_ONESHOT | ||
112 | #define SA_SAMPLE_RANDOM SA_RESTART | ||
113 | #define SA_SHIRQ 0x04000000 | ||
114 | #endif /* __KERNEL__ */ | ||
115 | 102 | ||
116 | #define SIG_BLOCK 0 /* for blocking signals */ | 103 | #define SIG_BLOCK 0 /* for blocking signals */ |
117 | #define SIG_UNBLOCK 1 /* for unblocking signals */ | 104 | #define SIG_UNBLOCK 1 /* for unblocking signals */ |