diff options
| author | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 18:48:23 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 18:48:23 -0800 |
| commit | ff31dc0b2b944b3d08c20d4d2a79e47345ac8b16 (patch) | |
| tree | 739643612a744b2cfcd35896e40e75fc45f61c0f /include/linux | |
| parent | 29f279c764808560eaceb88fef36cbc35c529aad (diff) | |
v2.4.5.6 -> v2.4.5.7
- Patrick Mochel: PCI documentation, and PM cleanups
- mtd: export nand ECC functions
- Jes Sorenson: acenic driver update
- Alan Cox: fix vxfs merge boo-boo
- me: undo page_launder() LRU changes, they have nasty side effects
- wanrouter: fix error code
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/pci.h | 7 | ||||
| -rw-r--r-- | include/linux/pm.h | 2 | ||||
| -rw-r--r-- | include/linux/swap.h | 10 |
3 files changed, 9 insertions, 10 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index aa3aacf0dd70..3b4ae41a9f14 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -478,6 +478,7 @@ struct pci_driver { const struct pci_device_id *id_table; /* NULL if wants all devices */ int (*probe) (struct pci_dev *dev, const struct pci_device_id *id); /* New device inserted */ void (*remove) (struct pci_dev *dev); /* Device removed (NULL if not a hot-plug capable driver) */ + int (*save_state) (struct pci_dev *dev, u32 state); /* Save Device Context */ int (*suspend)(struct pci_dev *dev, u32 state); /* Device suspended */ int (*resume) (struct pci_dev *dev); /* Device woken up */ int (*enable_wake) (struct pci_dev *dev, u32 state, int enable); /* Enable wake event */ @@ -647,6 +648,12 @@ static inline int scsi_to_pci_dma_dir(unsigned char scsi_dir) { return scsi_dir; static inline int pci_find_capability (struct pci_dev *dev, int cap) {return 0; } static inline const struct pci_device_id *pci_match_device(const struct pci_device_id *ids, const struct pci_dev *dev) { return NULL; } +/* Power management related routines */ +static inline int pci_save_state(struct pci_dev *dev, u32 *buffer) { return 0; } +static inline int pci_restore_state(struct pci_dev *dev, u32 *buffer) { return 0; } +static inline int pci_set_power_state(struct pci_dev *dev, int state) { return 0; } +static inline int pci_enable_wake(struct pci_dev *dev, u32 state, int enable) { return 0; } + #define pci_for_each_dev(dev) \ for(dev = NULL; 0; ) diff --git a/include/linux/pm.h b/include/linux/pm.h index ce31f81a640b..42d28f3cb793 100644 --- a/include/linux/pm.h +++ b/include/linux/pm.h @@ -34,6 +34,8 @@ enum PM_SUSPEND, /* enter D1-D3 */ PM_RESUME, /* enter D0 */ + PM_SAVE_STATE, /* save device's state */ + /* enable wake-on */ PM_SET_WAKEUP, diff --git a/include/linux/swap.h b/include/linux/swap.h index 71ad9d7f3773..d43f5d981d7c 100644 --- a/include/linux/swap.h +++ b/include/linux/swap.h @@ -205,16 +205,6 @@ extern spinlock_t pagemap_lru_lock; page->zone->inactive_dirty_pages++; \ } -/* Like the above, but add us after the bookmark. */ -#define add_page_to_inactive_dirty_list_marker(page) { \ - DEBUG_ADD_PAGE \ - ZERO_PAGE_BUG \ - SetPageInactiveDirty(page); \ - list_add(&(page)->lru, marker_lru); \ - nr_inactive_dirty_pages++; \ - page->zone->inactive_dirty_pages++; \ -} - #define add_page_to_inactive_clean_list(page) { \ DEBUG_ADD_PAGE \ ZERO_PAGE_BUG \ |